From b6314958e13f43ff56e63c61135de3feb80430e5 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Wed, 1 Aug 2018 15:09:51 -0300 Subject: [PATCH 1/2] deps: cherry-pick 09bca09 from upstream V8 Original commit message: [postmortem] add ScopeInfo and Context types The metadata introduced in this patch will be useful for postmortem tools to inspect Contexts and ScopeInfos (see https://github.com/nodejs/llnode/issues/211). R=bmeurer@google.com, yangguo@google.com Change-Id: I927fcab4014d128bd782046c1ecb9ee045723e95 Reviewed-on: https://chromium-review.googlesource.com/1153858 Reviewed-by: Yang Guo Commit-Queue: Yang Guo Cr-Commit-Position: refs/heads/master@{#54768} Refs: https://github.com/v8/v8/commit/09bca095e38d6e4770ae48e174f59d33c862abc2 --- common.gypi | 2 +- deps/v8/BUILD.gn | 1 + deps/v8/tools/gen-postmortem-metadata.py | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index 59b63e7740ff20..023e4f84cfcd5c 100644 --- a/common.gypi +++ b/common.gypi @@ -28,7 +28,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.12', + 'v8_embedder_string': '-node.13', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/BUILD.gn b/deps/v8/BUILD.gn index f00a8280c10261..fbb34a0b3dc14c 100644 --- a/deps/v8/BUILD.gn +++ b/deps/v8/BUILD.gn @@ -828,6 +828,7 @@ action("postmortem-metadata") { "src/objects/js-regexp-string-iterator.h", "src/objects/map.h", "src/objects/map-inl.h", + "src/objects/scope-info.h", "src/objects/script.h", "src/objects/script-inl.h", "src/objects/shared-function-info.h", diff --git a/deps/v8/tools/gen-postmortem-metadata.py b/deps/v8/tools/gen-postmortem-metadata.py index 88407bb96fb4f7..9a788199430b6d 100644 --- a/deps/v8/tools/gen-postmortem-metadata.py +++ b/deps/v8/tools/gen-postmortem-metadata.py @@ -58,6 +58,9 @@ { 'name': 'APIObjectType', 'value': 'JS_API_OBJECT_TYPE' }, { 'name': 'SpecialAPIObjectType', 'value': 'JS_SPECIAL_API_OBJECT_TYPE' }, + { 'name': 'FirstContextType', 'value': 'FIRST_CONTEXT_TYPE' }, + { 'name': 'LastContextType', 'value': 'LAST_CONTEXT_TYPE' }, + { 'name': 'IsNotStringMask', 'value': 'kIsNotStringMask' }, { 'name': 'StringTag', 'value': 'kStringTag' }, @@ -289,7 +292,7 @@ expected_classes = [ 'ConsString', 'FixedArray', 'HeapNumber', 'JSArray', 'JSFunction', 'JSObject', 'JSRegExp', 'JSValue', 'Map', 'Oddball', 'Script', - 'SeqOneByteString', 'SharedFunctionInfo' + 'SeqOneByteString', 'SharedFunctionInfo', 'ScopeInfo' ]; From c70098bb24abd50556ed7e22201e1b4e7e5ff404 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Wed, 1 Aug 2018 15:25:33 -0300 Subject: [PATCH 2/2] fixup! deps: cherry-pick 09bca09 from upstream V8 --- deps/v8/gypfiles/v8.gyp | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index af5ffdc41b823a..0266eaee2e71b1 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -2938,6 +2938,7 @@ '../src/objects/js-regexp-string-iterator.h', '../src/objects/map.h', '../src/objects/map-inl.h', + '../src/objects/scope-info.h', '../src/objects/script.h', '../src/objects/script-inl.h', '../src/objects/shared-function-info.h',