Skip to content

Commit

Permalink
deps/v8/src/torque/file-visitor.h:
Browse files Browse the repository at this point in the history
Add virtual dtor to avoid gcc error on Aix. (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.
  • Loading branch information
Vasili Skurydzin committed Nov 21, 2018
1 parent c6db967 commit 21c50f1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions deps/v8/src/torque/file-visitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/third_party/antlr4/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ config("antlr-compatibility") {
"-Wno-unused-but-set-variable",
]
}
if (is_aix) {
if (current_os == "aix") {
cflags += [ "-fdollars-in-identifiers" ]
}
}
Expand Down

0 comments on commit 21c50f1

Please sign in to comment.