From a98a44542ab31a038a8d304ea9a0fad631394268 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Mon, 17 Sep 2018 16:22:59 -0300 Subject: [PATCH 1/2] deps: backport 958b761 from upstream V8 Original commit message: [postmortem] add postmortem metadata for symbols As discussed in https://github.com/nodejs/llnode/issues/156, we need postmortem metadata for Symbols to properly print Symbol property names in postmortem debugging tools. Patch suggested by Ben Noordhuis (https://github.com/nodejs/llnode/issues/156#issuecomment-350467852). R=bmeurer@google.com, yangguo@google.com Change-Id: Ied6d3c079e8b23a9c796bc632c37785ed7dbc118 Reviewed-on: https://chromium-review.googlesource.com/1205052 Reviewed-by: Benedikt Meurer Reviewed-by: Yang Guo Commit-Queue: Yang Guo Cr-Commit-Position: refs/heads/master@{#55632} Refs: https://github.com/v8/v8/commit/958b761d3392495c3bf635e97fb9bd0e45714295 --- common.gypi | 2 +- deps/v8/BUILD.gn | 2 ++ deps/v8/tools/gen-postmortem-metadata.py | 7 +------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/common.gypi b/common.gypi index 46711ac76dbb63..bd287c5b0a93e3 100644 --- a/common.gypi +++ b/common.gypi @@ -29,7 +29,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.2', + 'v8_embedder_string': '-node.3', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn index c6a58776cd6a81..7e3406fb6760b6 100644 --- a/deps/v8/BUILD.gn +++ b/deps/v8/BUILD.gn @@ -865,6 +865,8 @@ action("postmortem-metadata") { "src/objects/js-regexp-string-iterator.h", "src/objects/map.h", "src/objects/map-inl.h", + "src/objects/name.h", + "src/objects/name-inl.h", "src/objects/scope-info.h", "src/objects/script.h", "src/objects/script-inl.h", diff --git a/deps/v8/tools/gen-postmortem-metadata.py b/deps/v8/tools/gen-postmortem-metadata.py index 8191c8152f5942..9bc1dd66d599f4 100644 --- a/deps/v8/tools/gen-postmortem-metadata.py +++ b/deps/v8/tools/gen-postmortem-metadata.py @@ -417,15 +417,10 @@ def load_objects_from_file(objfilename, checktypes): # way around. # for type in types: - # - # Symbols and Strings are implemented using the same classes. - # - usetype = re.sub('SYMBOL_', 'STRING_', type); - # # REGEXP behaves like REG_EXP, as in JS_REGEXP_TYPE => JSRegExp. # - usetype = re.sub('_REGEXP_', '_REG_EXP_', usetype); + usetype = re.sub('_REGEXP_', '_REG_EXP_', type); # # Remove the "_TYPE" suffix and then convert to camel case, From d12c5eb1ea8d249ea5c8e1d911c6b4a0a96bacc6 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Mon, 17 Sep 2018 16:58:23 -0300 Subject: [PATCH 2/2] fixup! deps: backport 958b761 from upstream V8 --- deps/v8/gypfiles/v8.gyp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 0a2b104ac0bdf9..bcbc0fe72d7bab 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -2728,6 +2728,8 @@ '../src/objects/js-regexp-string-iterator.h', '../src/objects/map.h', '../src/objects/map-inl.h', + '../src/objects/name.h', + '../src/objects/name-inl.h', '../src/objects/scope-info.h', '../src/objects/script.h', '../src/objects/script-inl.h',