Skip to content

Commit

Permalink
deps: V8: backport 895949419186
Browse files Browse the repository at this point in the history
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 <aeubanks@google.com>
    Reviewed-by: Sathya Gunasekaran  <gsathya@chromium.org>
    Cr-Commit-Position: refs/heads/master@{#69625}

Refs: v8/v8@8959494

PR-URL: #39245
Refs: nodejs/build#2696
Reviewed-By: Richard Lau <rlau@redhat.com>
  • Loading branch information
targos authored and richardlau committed Jul 23, 2021
1 parent 8046daf commit 15b91fa
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion common.gypi
Expand Up @@ -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 #####

Expand Down
7 changes: 7 additions & 0 deletions deps/v8/test/cctest/BUILD.gn
Expand Up @@ -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

Expand Down Expand Up @@ -376,6 +382,7 @@ v8_source_set("cctest_sources") {
configs = [
"../..:external_config",
"../..:internal_config_base",
":cctest_sources_config",
]

public_deps = [
Expand Down

0 comments on commit 15b91fa

Please sign in to comment.