diff options
author | Anna Henningsen <anna@addaleax.net> | 2018-10-11 01:24:08 +0300 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2018-10-13 07:07:21 +0300 |
commit | 3ab4146008bcee397bc76dbdf00e43647260218d (patch) | |
tree | accc810ec37da21b7243f7f0b3b59f95a43b185d /deps | |
parent | 9ed4646df05b9593075bb0cd0b3ab420bae482a5 (diff) |
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: https://github.com/v8/v8/commit/b0af30948505b68c843b538e109ab378d3750e37
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps')
-rw-r--r-- | deps/v8/include/v8.h | 24 | ||||
-rw-r--r-- | deps/v8/src/api.cc | 8 |
2 files changed, 0 insertions, 32 deletions
diff --git a/deps/v8/include/v8.h b/deps/v8/include/v8.h index 4a104e57d87..6c3cc84fba7 100644 --- a/deps/v8/include/v8.h +++ b/deps/v8/include/v8.h @@ -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. */ @@ -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()); }; /** @@ -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 @@ -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 diff --git a/deps/v8/src/api.cc b/deps/v8/src/api.cc index 5f1737b2a42..fbd947b9230 100644 --- a/deps/v8/src/api.cc +++ b/deps/v8/src/api.cc @@ -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) { |