From f00b0a3485b40526b3c57d6db44b3385f8c16009 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Fri, 30 Nov 2018 10:20:04 +0900 Subject: [PATCH] chore: pick_b0af309_from_upstream_v8.patch is not needed for Ch70 --- patches/common/v8/.patches | 1 - ...cherry-pick_b0af309_from_upstream_v8.patch | 112 ------------------ 2 files changed, 113 deletions(-) delete mode 100644 patches/common/v8/deps_cherry-pick_b0af309_from_upstream_v8.patch diff --git a/patches/common/v8/.patches b/patches/common/v8/.patches index d0a6b3dd62a9..0076cef8be85 100644 --- a/patches/common/v8/.patches +++ b/patches/common/v8/.patches @@ -14,4 +14,3 @@ deps_revert_9136dd8088a9_from_upstream_v8.patch deps_provide_more_v8_backwards_compatibility.patch deps_backport_958b761_from_upstream_v8.patch deps_v8_cherry-pick_64-bit_hash_seed_commits.patch -deps_cherry-pick_b0af309_from_upstream_v8.patch diff --git a/patches/common/v8/deps_cherry-pick_b0af309_from_upstream_v8.patch b/patches/common/v8/deps_cherry-pick_b0af309_from_upstream_v8.patch deleted file mode 100644 index 77bc1bbdcff8..000000000000 --- a/patches/common/v8/deps_cherry-pick_b0af309_from_upstream_v8.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Anna Henningsen -Date: Wed, 10 Oct 2018 15:24:08 -0700 -Subject: deps: cherry-pick b0af309 from upstream V8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -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 - Commit-Queue: Clemens Hammacher - 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 -Reviewed-By: Rich Trott -Reviewed-By: Joyee Cheung -Reviewed-By: Sakthipriyan Vairamani -Reviewed-By: Tiancheng "Timothy" Gu -Reviewed-By: Gus Caplan -Reviewed-By: James M Snell -Reviewed-By: Michaƫl Zasso -Reviewed-By: Colin Ihrig - -diff --git a/include/v8.h b/include/v8.h -index cc2fefc56a4eeaeab48f2042d6c8dbbadb1e3210..3902c6330ab9cc9e16fda69dc83ca88424216454 100644 ---- a/include/v8.h -+++ b/include/v8.h -@@ -4362,13 +4362,6 @@ class V8_EXPORT WasmCompiledModule : public Object { - public: - typedef std::pair, 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 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 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/src/api.cc b/src/api.cc -index bc544f1c7c7f9f8e3bac9804697848ededb6a30a..3575cc89dda68d34ffde1574cca9e7b56017fd09 100644 ---- a/src/api.cc -+++ b/src/api.cc -@@ -7386,14 +7386,6 @@ WasmCompiledModule::BufferReference WasmCompiledModule::GetWasmWireBytesRef() { - return {bytes_vec.start(), bytes_vec.size()}; - } - --Local WasmCompiledModule::GetWasmWireBytes() { -- BufferReference ref = GetWasmWireBytesRef(); -- CHECK_LE(ref.size, String::kMaxLength); -- return String::NewFromOneByte(GetIsolate(), ref.start, NewStringType::kNormal, -- static_cast(ref.size)) -- .ToLocalChecked(); --} -- - WasmCompiledModule::TransferrableModule - WasmCompiledModule::GetTransferrableModule() { - if (i::FLAG_wasm_shared_code) {