Skip to content

deps: cherry-pick 7bd24767 from v8 upstream (v6.x) #8078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fhinkel wants to merge 1 commit into from
Closed

deps: cherry-pick 7bd24767 from v8 upstream (v6.x) #8078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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}
  • Loading branch information
@fhinkel
fhinkel committed Aug 12, 2016
commit eac8938af5fae088089ada5401b022f172208482
2 changes: 1 addition & 1 deletion deps/v8/include/v8-version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 5
#define V8_MINOR_VERSION 0
#define V8_BUILD_NUMBER 71
#define V8_PATCH_LEVEL 60
#define V8_PATCH_LEVEL 61

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
14 changes: 8 additions & 6 deletions deps/v8/src/js/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,13 +782,15 @@ function FormatErrorString(error) {


function GetStackFrames(raw_stack) {
var internal_raw_stack = new InternalArray();
%MoveArrayContents(raw_stack, internal_raw_stack);
var frames = new InternalArray();
var sloppy_frames = raw_stack[0];
for (var i = 1; i < raw_stack.length; i += 4) {
var recv = raw_stack[i];
var fun = raw_stack[i + 1];
var code = raw_stack[i + 2];
var pc = raw_stack[i + 3];
var sloppy_frames = internal_raw_stack[0];
for (var i = 1; i < internal_raw_stack.length; i += 4) {
var recv = internal_raw_stack[i];
var fun = internal_raw_stack[i + 1];
var code = internal_raw_stack[i + 2];
var pc = internal_raw_stack[i + 3];
var pos = %_IsSmi(code) ? code : %FunctionGetPositionForOffset(code, pc);
sloppy_frames--;
frames.push(new CallSite(recv, fun, pos, (sloppy_frames < 0)));
Expand Down