Skip to content

Commit 083d101

Browse files
addaleaxjasnell
authored andcommitted
deps: cherry-pick b0af309 from upstream V8
Original commit message: [api] Remove deprecated wasm methods These methods were deprecated in 7.0, now we can remove them. R=adamk@chromium.org Bug: v8:7868 Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng Change-Id: I60badb378a055152bdd27aed67d11ddf74fce174 Reviewed-on: https://chromium-review.googlesource.com/1209283 Reviewed-by: Adam Klein <adamk@chromium.org> Commit-Queue: Clemens Hammacher <clemensh@chromium.org> Cr-Commit-Position: refs/heads/master@{#55695} Refs: v8/v8@b0af309 PR-URL: #23415 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent cb569a3 commit 083d101

File tree

3 files changed

+1
-33
lines changed

3 files changed

+1
-33
lines changed

common.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
# Reset this number to 0 on major V8 upgrades.
3535
# Increment by one for each non-official patch applied to deps/v8.
36-
'v8_embedder_string': '-node.4',
36+
'v8_embedder_string': '-node.5',
3737

3838
# Enable disassembler for `--print-code` v8 options
3939
'v8_enable_disassembler': 1,

deps/v8/include/v8.h

-24
Original file line numberDiff line numberDiff line change
@@ -4362,13 +4362,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
43624362
public:
43634363
typedef std::pair<std::unique_ptr<const uint8_t[]>, size_t> SerializedModule;
43644364

4365-
// The COMMA macro allows us to use ',' inside of the V8_DEPRECATED macro.
4366-
#define COMMA ,
4367-
V8_DEPRECATED(
4368-
"Use BufferReference.",
4369-
typedef std::pair<const uint8_t * COMMA size_t> CallerOwnedBuffer);
4370-
#undef COMMA
4371-
43724365
/**
43734366
* A unowned reference to a byte buffer.
43744367
*/
@@ -4377,12 +4370,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
43774370
size_t size;
43784371
BufferReference(const uint8_t* start, size_t size)
43794372
: start(start), size(size) {}
4380-
// Temporarily allow conversion to and from CallerOwnedBuffer.
4381-
V8_DEPRECATED(
4382-
"Use BufferReference directly.",
4383-
inline BufferReference(CallerOwnedBuffer)); // NOLINT(runtime/explicit)
4384-
V8_DEPRECATED("Use BufferReference directly.",
4385-
inline operator CallerOwnedBuffer());
43864373
};
43874374

43884375
/**
@@ -4429,8 +4416,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
44294416
* Get the wasm-encoded bytes that were used to compile this module.
44304417
*/
44314418
BufferReference GetWasmWireBytesRef();
4432-
V8_DEPRECATED("Use GetWasmWireBytesRef version.",
4433-
Local<String> GetWasmWireBytes());
44344419

44354420
/**
44364421
* Serialize the compiled module. The serialized data does not include the
@@ -4463,15 +4448,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
44634448
static void CheckCast(Value* obj);
44644449
};
44654450

4466-
// TODO(clemensh): Remove after M70 branch.
4467-
WasmCompiledModule::BufferReference::BufferReference(
4468-
WasmCompiledModule::CallerOwnedBuffer buf)
4469-
: BufferReference(buf.first, buf.second) {}
4470-
WasmCompiledModule::BufferReference::
4471-
operator WasmCompiledModule::CallerOwnedBuffer() {
4472-
return {start, size};
4473-
}
4474-
44754451
/**
44764452
* The V8 interface for WebAssembly streaming compilation. When streaming
44774453
* compilation is initiated, V8 passes a {WasmStreaming} object to the embedder

deps/v8/src/api.cc

-8
Original file line numberDiff line numberDiff line change
@@ -7382,14 +7382,6 @@ WasmCompiledModule::BufferReference WasmCompiledModule::GetWasmWireBytesRef() {
73827382
return {bytes_vec.start(), bytes_vec.size()};
73837383
}
73847384

7385-
Local<String> WasmCompiledModule::GetWasmWireBytes() {
7386-
BufferReference ref = GetWasmWireBytesRef();
7387-
CHECK_LE(ref.size, String::kMaxLength);
7388-
return String::NewFromOneByte(GetIsolate(), ref.start, NewStringType::kNormal,
7389-
static_cast<int>(ref.size))
7390-
.ToLocalChecked();
7391-
}
7392-
73937385
WasmCompiledModule::TransferrableModule
73947386
WasmCompiledModule::GetTransferrableModule() {
73957387
if (i::FLAG_wasm_shared_code) {

0 commit comments

Comments
 (0)