Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 07:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change interface of js_ExecuteTree to indicate which of the peer fragments it really executed (since we soon will have more than one tree that could be activated for that particular bytecode location).

Browse Source
This commit is contained in:
Andreas Gal 2008-08-16 15:45:48 -07:00
parent 7de9d2311c
commit 44276098c7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/src/jstracer.cpp
View File

@ -1700,7 +1700,7 @@ js_AttemptToExtendTree(JSContext* cx, GuardRecord* lr, Fragment* f)
}
GuardRecord*
js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount);
js_ExecuteTree(JSContext* cx, Fragment** treep, uintN& inlineCallCount);
bool
js_ContinueRecording(JSContext* cx, TraceRecorder* r, jsbytecode* oldpc, uintN& inlineCallCount)
@ -1733,7 +1733,7 @@ js_ContinueRecording(JSContext* cx, TraceRecorder* r, jsbytecode* oldpc, uintN&
if (nesting_enabled && f && f->code() && !((TreeInfo*)f->vmprivate)->globalSlots.length()) {
JS_ASSERT(f->vmprivate);
/* call the inner tree */
GuardRecord* lr = js_ExecuteTree(cx, f, inlineCallCount);
GuardRecord* lr = js_ExecuteTree(cx, &f, inlineCallCount);
if (!lr) {
js_AbortRecording(cx, oldpc, "Couldn't call inner tree");
return false;
@ -1764,8 +1764,10 @@ js_ContinueRecording(JSContext* cx, TraceRecorder* r, jsbytecode* oldpc, uintN&
}
GuardRecord*
js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount)
js_ExecuteTree(JSContext* cx, Fragment** treep, uintN& inlineCallCount)
{
Fragment* f = *treep;
AUDIT(traceTriggered);
/* execute previously recorded trace */
@ -1961,7 +1963,7 @@ js_LoopEdge(JSContext* cx, jsbytecode* oldpc, uintN& inlineCallCount)
JS_ASSERT(!tm->recorder);
/* if this is a local branch in the same loop, grow the tree */
GuardRecord* lr = js_ExecuteTree(cx, f, inlineCallCount);
GuardRecord* lr = js_ExecuteTree(cx, &f, inlineCallCount);
if (lr && (lr->from->root == f) && (lr->exit->exitType == BRANCH_EXIT))
return js_AttemptToExtendTree(cx, lr, f);
/* if this exits the loop, resume interpretation */