corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly recover from a nested side exit with more than a single level of nesting (459539, r=danderson).

Browse Source
This commit is contained in:
Andreas Gal
2008-10-12 15:39:32 -07:00
parent 9a3c9b6a8b
commit 561fe2fb28
5 changed files with 91 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jsbuiltins.cpp
View File

@@ -56,8 +56,7 @@
#include "jsscope.h"
#include "jsstr.h"
#include "jsbuiltins.h"
#include "nanojit.h"
#include "jstracer.h"
using namespace avmplus;
using namespace nanojit;
@@ -271,8 +270,11 @@ js_CallTree(InterpState* state, Fragment* f)
/* This only occurs once a tree call guard mismatches and we unwind the tree call stack.
We store the first (innermost) tree call guard in state and we will try to grow
the outer tree the failing call was in starting at that guard. */
if (!state->lastTreeCallGuard)
if (!state->lastTreeCallGuard) {
state->lastTreeCallGuard = lr;
FrameInfo* rp = (FrameInfo*)state->rp;
state->rpAtLastTreeCall = rp + lr->calldepth;
}
} else {
/* If the tree exits on a regular (non-nested) guard, keep updating lastTreeExitGuard
with that guard. If we mismatch on a tree call guard, this will contain the last