From 15b91fa3fac3e5a3a65f83ad9a5f312157ec7fd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 7 Jul 2021 12:02:18 +0200 Subject: [PATCH] deps: V8: backport 895949419186 Original commit message: Add -Wno-string-concatenation to test/cctest:cctest_sources v8/test/cctest/interpreter/test-bytecode-generator.cc contains lots of string arrays with intentional concatenation. Bug: chromium:1114873 Change-Id: Ie9d35c3849b5b0a6d1d01b6ce21fb80a320d8736 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2366829 Commit-Queue: Arthur Eubanks Reviewed-by: Sathya Gunasekaran Cr-Commit-Position: refs/heads/master@{#69625} Refs: https://github.com/v8/v8/commit/8959494191869ff483927916f9f46eb419784f07 PR-URL: https://github.com/nodejs/node/pull/39245 Refs: https://github.com/nodejs/build/issues/2696 Reviewed-By: Richard Lau --- common.gypi | 2 +- deps/v8/test/cctest/BUILD.gn | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index 18bde8e9d0f2b7..32ceb385180688 100644 --- a/common.gypi +++ b/common.gypi @@ -34,7 +34,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.54', + 'v8_embedder_string': '-node.55', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/test/cctest/BUILD.gn b/deps/v8/test/cctest/BUILD.gn index 1a527073450fac..8acd2e50f3edff 100644 --- a/deps/v8/test/cctest/BUILD.gn +++ b/deps/v8/test/cctest/BUILD.gn @@ -63,6 +63,12 @@ v8_header_set("cctest_headers") { ] } +config("cctest_sources_config") { + if (is_clang) { + cflags = [ "-Wno-string-concatenation" ] + } +} + v8_source_set("cctest_sources") { testonly = true @@ -376,6 +382,7 @@ v8_source_set("cctest_sources") { configs = [ "../..:external_config", "../..:internal_config_base", + ":cctest_sources_config", ] public_deps = [