From 81e9a3bfcb231ba6310c707f774e736b3a5b8aed Mon Sep 17 00:00:00 2001 From: Ali Ijaz Sheikh Date: Tue, 10 Jan 2017 16:27:10 -0800 Subject: [PATCH] deps: V8: fix debug backtrace for symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The cherry-pick of #7612 to v4.x (4369055) added in #9298 wasn't quite correct as it depends on a runtime function %SymbolDescriptiveString that doesn't exist on v4.x. We can use %SymbolDescription instead. Ref: https://github.com/nodejs/node/pull/7612 Ref: https://github.com/nodejs/node/pull/9298 PR-URL: https://github.com/nodejs/node/pull/10732 Reviewed-By: James M Snell Reviewed-By: Fedor Indutny Reviewed-By: Myles Borins Reviewed-By: Michaël Zasso Reviewed-By: Ben Noordhuis Reviewed-By: Colin Ihrig --- deps/v8/include/v8-version.h | 2 +- deps/v8/src/mirror-debugger.js | 2 +- deps/v8/test/mjsunit/debug-backtrace-text.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index da3946133d5082..f88cdeddb2a237 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 4 #define V8_MINOR_VERSION 5 #define V8_BUILD_NUMBER 103 -#define V8_PATCH_LEVEL 43 +#define V8_PATCH_LEVEL 44 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/src/mirror-debugger.js b/deps/v8/src/mirror-debugger.js index c6540e31d96f06..d2b97ec66f0800 100644 --- a/deps/v8/src/mirror-debugger.js +++ b/deps/v8/src/mirror-debugger.js @@ -1515,7 +1515,7 @@ PropertyMirror.prototype.name = function() { PropertyMirror.prototype.toText = function() { - if (IS_SYMBOL(this.name_)) return %SymbolDescriptiveString(this.name_); + if (IS_SYMBOL(this.name_)) return %SymbolDescription(this.name_); return this.name_; }; diff --git a/deps/v8/test/mjsunit/debug-backtrace-text.js b/deps/v8/test/mjsunit/debug-backtrace-text.js index cfc89e6c1d6762..8afc1f8d9b3a75 100644 --- a/deps/v8/test/mjsunit/debug-backtrace-text.js +++ b/deps/v8/test/mjsunit/debug-backtrace-text.js @@ -106,7 +106,7 @@ function listener(event, exec_state, event_data, data) { // 2: [anonymous] assertEquals("new Point(x=0, y=0)", exec_state.frame(0).invocationText()); - assertEquals("#[Symbol(Das Symbol)](x=0, y=0)", + assertEquals("#[Das Symbol](x=0, y=0)", exec_state.frame(1).invocationText()); assertEquals("[anonymous]()", exec_state.frame(2).invocationText()); listenerCalled = true;