Skip to content

Commit

Permalink
deps: cherry-pick b0af309 from upstream V8
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
addaleax authored and jasnell committed Oct 17, 2018
1 parent cb569a3 commit 083d101
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

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

# Enable disassembler for `--print-code` v8 options
'v8_enable_disassembler': 1,
Expand Down
24 changes: 0 additions & 24 deletions deps/v8/include/v8.h
Original file line number Diff line number Diff line change
Expand Up @@ -4362,13 +4362,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
public:
typedef std::pair<std::unique_ptr<const uint8_t[]>, size_t> SerializedModule;

// The COMMA macro allows us to use ',' inside of the V8_DEPRECATED macro.
#define COMMA ,
V8_DEPRECATED(
"Use BufferReference.",
typedef std::pair<const uint8_t * COMMA size_t> CallerOwnedBuffer);
#undef COMMA

/**
* A unowned reference to a byte buffer.
*/
Expand All @@ -4377,12 +4370,6 @@ class V8_EXPORT WasmCompiledModule : public Object {
size_t size;
BufferReference(const uint8_t* start, size_t size)
: start(start), size(size) {}
// Temporarily allow conversion to and from CallerOwnedBuffer.
V8_DEPRECATED(
"Use BufferReference directly.",
inline BufferReference(CallerOwnedBuffer)); // NOLINT(runtime/explicit)
V8_DEPRECATED("Use BufferReference directly.",
inline operator CallerOwnedBuffer());
};

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

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

// TODO(clemensh): Remove after M70 branch.
WasmCompiledModule::BufferReference::BufferReference(
WasmCompiledModule::CallerOwnedBuffer buf)
: BufferReference(buf.first, buf.second) {}
WasmCompiledModule::BufferReference::
operator WasmCompiledModule::CallerOwnedBuffer() {
return {start, size};
}

/**
* The V8 interface for WebAssembly streaming compilation. When streaming
* compilation is initiated, V8 passes a {WasmStreaming} object to the embedder
Expand Down
8 changes: 0 additions & 8 deletions deps/v8/src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7382,14 +7382,6 @@ WasmCompiledModule::BufferReference WasmCompiledModule::GetWasmWireBytesRef() {
return {bytes_vec.start(), bytes_vec.size()};
}

Local<String> WasmCompiledModule::GetWasmWireBytes() {
BufferReference ref = GetWasmWireBytesRef();
CHECK_LE(ref.size, String::kMaxLength);
return String::NewFromOneByte(GetIsolate(), ref.start, NewStringType::kNormal,
static_cast<int>(ref.size))
.ToLocalChecked();
}

WasmCompiledModule::TransferrableModule
WasmCompiledModule::GetTransferrableModule() {
if (i::FLAG_wasm_shared_code) {
Expand Down

0 comments on commit 083d101

Please sign in to comment.