From efee8341ada0117566b40f70a2330951dd45f4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 29 Sep 2020 20:12:37 +0200 Subject: [PATCH] deps: V8: cherry-pick 717543bbf0ef Original commit message: [zone]: fix build on msvc in wasm module Fix: https://github.com/nodejs/node-v8/issues/172 Change-Id: Ibdbee76470ec8a4c20af7650dc5fac4602873430 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2414688 Reviewed-by: Jakob Kummerow Commit-Queue: Jakob Kummerow Cr-Commit-Position: refs/heads/master@{#70109} Refs: https://github.com/v8/v8/commit/717543bbf0ef79557dc7b3a7dc845dc5611621d9 PR-URL: https://github.com/nodejs/node/pull/35415 Reviewed-By: Rich Trott Reviewed-By: Jiawen Geng Reviewed-By: Daniel Bevenius Reviewed-By: Matteo Collina Reviewed-By: Myles Borins --- common.gypi | 2 +- deps/v8/src/wasm/wasm-module-builder.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 5e5ac96a78fa29..d9d29fdca1579c 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,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.12', + 'v8_embedder_string': '-node.13', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/wasm/wasm-module-builder.h b/deps/v8/src/wasm/wasm-module-builder.h index 309d4bbb9f12fd..fdd64950df4fec 100644 --- a/deps/v8/src/wasm/wasm-module-builder.h +++ b/deps/v8/src/wasm/wasm-module-builder.h @@ -361,6 +361,8 @@ class V8_EXPORT_PRIVATE WasmModuleBuilder : public ZoneObject { // Indirect functions must be allocated before adding extra tables. bool allocating_indirect_functions_allowed_ = true; #endif + + DISALLOW_COPY_AND_ASSIGN(WasmModuleBuilder); }; inline FunctionSig* WasmFunctionBuilder::signature() {