Skip to content

Commit 08e2b04

Browse files
committed
deps: cherry-pick 7bd24767 from v8 upstream (v6.x)
Original commit message: Version 5.1.281.65 (cherry-pick) Merged 85b8c2dc4aee1031ac02f9d7c02d5c1aa76bc2ba Fix observable array access when formatting stack trace. BUG=chromium:617527 LOG=N R=hablich@chromium.org Review URL: https://codereview.chromium.org/2051383002 . Cr-Commit-Position: refs/branch-heads/5.1@{#76} Cr-Branched-From: 167dc63b4c9a1d0f0fe1b19af93644ac9a561e83-refs/heads/5.1.281@{#1} Cr-Branched-From: 03953f52bd4a184983a551927c406be6489ef89b-refs/heads/master@{#35282} PR-URL: #8078 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
1 parent 5cff147 commit 08e2b04

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

deps/v8/include/v8-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 5
1212
#define V8_MINOR_VERSION 0
1313
#define V8_BUILD_NUMBER 71
14-
#define V8_PATCH_LEVEL 60
14+
#define V8_PATCH_LEVEL 61
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

deps/v8/src/js/messages.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -782,13 +782,15 @@ function FormatErrorString(error) {
782782

783783

784784
function GetStackFrames(raw_stack) {
785+
var internal_raw_stack = new InternalArray();
786+
%MoveArrayContents(raw_stack, internal_raw_stack);
785787
var frames = new InternalArray();
786-
var sloppy_frames = raw_stack[0];
787-
for (var i = 1; i < raw_stack.length; i += 4) {
788-
var recv = raw_stack[i];
789-
var fun = raw_stack[i + 1];
790-
var code = raw_stack[i + 2];
791-
var pc = raw_stack[i + 3];
788+
var sloppy_frames = internal_raw_stack[0];
789+
for (var i = 1; i < internal_raw_stack.length; i += 4) {
790+
var recv = internal_raw_stack[i];
791+
var fun = internal_raw_stack[i + 1];
792+
var code = internal_raw_stack[i + 2];
793+
var pc = internal_raw_stack[i + 3];
792794
var pos = %_IsSmi(code) ? code : %FunctionGetPositionForOffset(code, pc);
793795
sloppy_frames--;
794796
frames.push(new CallSite(recv, fun, pos, (sloppy_frames < 0)));

0 commit comments

Comments
 (0)