From 20430ae487c312c4a2bbd2a6df22bcf6770a7cd5 Mon Sep 17 00:00:00 2001 From: Vasili Skurydzin Date: Tue, 16 Oct 2018 10:36:48 -0400 Subject: [PATCH] deps: V8: Add virtual dtor to avoid aix gcc error deps/v8/src/torque/file-visitor.h: * Not currently present in v8/master deps/v8/third_party/antlr4/BUILD.gn: * Use current_os variable to avoid is_aix being undefined. The following patch to v8/build solves this issue for v8/master: * a1a12ef3b343f9e75c630ed6dc8f1ea44a8a747b However, the version of '/chromium/src/build.git' cannot be updated to include this patch in v8/DEPS file. (could potentially cause issues for other platforms) The change to deps/v8/src/torque/file-visitor.h is a workaround for origin/v10.x-staging branch. PR-URL: https://github.com/nodejs/node/pull/23695 Reviewed-By: Michael Dawson Reviewed-By: Refael Ackermann Reviewed-By: Yang Guo Reviewed-By: Ujjwal Sharma --- common.gypi | 2 +- deps/v8/src/torque/file-visitor.h | 4 ++++ deps/v8/third_party/antlr4/BUILD.gn | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 7d11d9e1382588..f0315b198a85a0 100644 --- a/common.gypi +++ b/common.gypi @@ -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.43', + 'v8_embedder_string': '-node.44', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/torque/file-visitor.h b/deps/v8/src/torque/file-visitor.h index 5aac1bad46d6a4..45820c5b6bf8ef 100644 --- a/deps/v8/src/torque/file-visitor.h +++ b/deps/v8/src/torque/file-visitor.h @@ -21,6 +21,10 @@ namespace torque { class FileVisitor { public: +#if defined(__GNUC__) && V8_OS_AIX + // prevent non-virtual-dtor gcc error on Aix + virtual ~FileVisitor() = default; +#endif explicit FileVisitor(GlobalContext& global_context) : global_context_(global_context), declarations_(global_context.declarations()), diff --git a/deps/v8/third_party/antlr4/BUILD.gn b/deps/v8/third_party/antlr4/BUILD.gn index 65e2a78eb4c398..8d3d98a399f0f6 100644 --- a/deps/v8/third_party/antlr4/BUILD.gn +++ b/deps/v8/third_party/antlr4/BUILD.gn @@ -9,7 +9,7 @@ config("antlr-compatibility") { "-Wno-unused-but-set-variable", ] } - if (is_aix) { + if (current_os == "aix") { cflags += [ "-fdollars-in-identifiers" ] } }