Skip to content

Commit

Permalink
deps: V8: fix debug backtrace for symbols
Browse files Browse the repository at this point in the history
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: #7612
Ref: #9298

PR-URL: #10732
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Fedor Indutny <[email protected]>
Reviewed-By: Myles Borins <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
  • Loading branch information
ofrobots authored and MylesBorins committed Feb 1, 2017
1 parent cfa2b87 commit 81e9a3b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/mirror-debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
};

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/test/mjsunit/debug-backtrace-text.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("#<Object>[Symbol(Das Symbol)](x=0, y=0)",
assertEquals("#<Object>[Das Symbol](x=0, y=0)",
exec_state.frame(1).invocationText());
assertEquals("[anonymous]()", exec_state.frame(2).invocationText());
listenerCalled = true;
Expand Down

0 comments on commit 81e9a3b

Please sign in to comment.