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

fhinkel · fhinkel · commit 08e2b0408a92 · 2016-08-17T14:38:11.000+02:00
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>
diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h
@@ -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.)
diff --git a/deps/v8/src/js/messages.js b/deps/v8/src/js/messages.js
@@ -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)));

-Original file line number
+Diff line change
 #defineV8_MAJOR_VERSION 5
 #defineV8_MINOR_VERSION 0
 #defineV8_BUILD_NUMBER 71
 -#defineV8_PATCH_LEVEL60
 +#defineV8_PATCH_LEVEL61
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
-Original file line number
+Diff line change
 functionGetStackFrames(raw_stack){
 +varinternal_raw_stack=newInternalArray();
 +%MoveArrayContents(raw_stack,internal_raw_stack);
 varframes=newInternalArray();
 -varsloppy_frames=raw_stack[0];
 -for(vari=1;i<raw_stack.length;i+=4){
 -varrecv=raw_stack[i];
 -varfun=raw_stack[i+1];
 -varcode=raw_stack[i+2];
 -varpc=raw_stack[i+3];
 +varsloppy_frames=internal_raw_stack[0];
 +for(vari=1;i<internal_raw_stack.length;i+=4){
 +varrecv=internal_raw_stack[i];
 +varfun=internal_raw_stack[i+1];
 +varcode=internal_raw_stack[i+2];
 +varpc=internal_raw_stack[i+3];
 varpos=%_IsSmi(code) ? code : %FunctionGetPositionForOffset(code,pc);
 sloppy_frames--;
 frames.push(newCallSite(recv,fun,pos,(sloppy_frames<0)));