From ce8ba875712a6230622ceb173036b2e806497ff2 Mon Sep 17 00:00:00 2001 From: Matheus Marchini Date: Tue, 17 Jul 2018 13:55:20 -0300 Subject: [PATCH] deps: cherry-pick 804a693 from upstream V8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: [postmortem] add JS_ERROR_TYPE and context embedder index * JS_ERROR_TYPE is required for postmortem tools to inspect JSError objects (see https://github.com/nodejs/llnode/pull/215 for a usage example) * The context embedder index is required for postmortem tools to access embedder data stored in the context (see https://github.com/nodejs/llnode/pull/204 for a usage example) R=bmeurer@google.com, yangguo@google.com Change-Id: Ib7c7eb44f6ad327fc71a1d45f510c49377db7a25 Reviewed-on: https://chromium-review.googlesource.com/1138493 Reviewed-by: Benedikt Meurer Commit-Queue: Benedikt Meurer Cr-Commit-Position: refs/heads/master@{#54475} Refs: https://github.com/v8/v8/commit/804a693eb4ac2fed160c683d16444a53b5 PR-URL: https://github.com/nodejs/node/pull/21855 Reviewed-By: Michaël Zasso Reviewed-By: Gus Caplan Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Colin Ihrig Reviewed-By: Yang Guo --- common.gypi | 2 +- deps/v8/tools/gen-postmortem-metadata.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index e7ef87e701dbf1..59b63e7740ff20 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.11', + 'v8_embedder_string': '-node.12', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/tools/gen-postmortem-metadata.py b/deps/v8/tools/gen-postmortem-metadata.py index 97f2ac9c63153c..88407bb96fb4f7 100644 --- a/deps/v8/tools/gen-postmortem-metadata.py +++ b/deps/v8/tools/gen-postmortem-metadata.py @@ -211,6 +211,9 @@ 'value': 'Context::EXTENSION_INDEX' }, { 'name': 'context_min_slots', 'value': 'Context::MIN_CONTEXT_SLOTS' }, + { 'name': 'context_idx_embedder_data', + 'value': 'Internals::kContextEmbedderDataIndex' }, + { 'name': 'namedictionaryshape_prefix_size', 'value': 'NameDictionaryShape::kPrefixSize' }, @@ -231,6 +234,8 @@ 'value': 'SimpleNumberDictionaryShape::kPrefixSize' }, { 'name': 'simplenumberdictionaryshape_entry_size', 'value': 'SimpleNumberDictionaryShape::kEntrySize' }, + + { 'name': 'type_JSError__JS_ERROR_TYPE', 'value': 'JS_ERROR_TYPE' }, ]; #