mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changeset f0d8feea4d9e.
This commit is contained in:
parent
31fdfa17e9
commit
7949d31eed
@ -321,7 +321,6 @@ BEGIN_CASE(JSOP_STOP)
|
||||
traceOp == JSOP_TRACE || traceOp == JSOP_NOP);
|
||||
#endif
|
||||
TRACE_0(LeaveFrame);
|
||||
#ifdef JS_TRACE_RECURSION
|
||||
if (!TRACE_RECORDER(cx) && recursive) {
|
||||
if (*(regs.pc + JSOP_CALL_LENGTH) == JSOP_TRACE) {
|
||||
regs.pc += JSOP_CALL_LENGTH;
|
||||
@ -330,7 +329,6 @@ BEGIN_CASE(JSOP_STOP)
|
||||
DO_OP();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (*(regs.pc + JSOP_CALL_LENGTH) == JSOP_TRACE ||
|
||||
*(regs.pc + JSOP_CALL_LENGTH) == JSOP_NOP) {
|
||||
JS_STATIC_ASSERT(JSOP_TRACE_LENGTH == JSOP_NOP_LENGTH);
|
||||
@ -2227,18 +2225,16 @@ BEGIN_CASE(JSOP_APPLY)
|
||||
if (TRACE_RECORDER(cx)) {
|
||||
TRACE_1(EnterFrame, inlineCallCount);
|
||||
RESTORE_INTERP_VARS();
|
||||
# ifdef JS_TRACE_RECURSION
|
||||
} else if (fp->script == fp->down->script &&
|
||||
*fp->down->regs->pc == JSOP_CALL) {
|
||||
# ifdef DEBUG
|
||||
#ifdef DEBUG
|
||||
JSOp traceOp = js_GetOpcode(cx, fp->script,
|
||||
fp->regs->pc);
|
||||
JS_ASSERT_IF(!fp->imacpc, traceOp == JSOP_TRACE ||
|
||||
traceOp == JSOP_NOP);
|
||||
# endif
|
||||
#endif
|
||||
if (*fp->regs->pc == JSOP_TRACE)
|
||||
MONITOR_BRANCH(Monitor_EnterFrame);
|
||||
# endif
|
||||
}
|
||||
#endif
|
||||
|
||||
|
@ -9645,9 +9645,6 @@ TraceRecorder::putArguments()
|
||||
static JS_REQUIRES_STACK inline bool
|
||||
IsTraceableRecursion(JSContext *cx)
|
||||
{
|
||||
#ifndef JS_TRACE_RECURSION
|
||||
return false;
|
||||
#else
|
||||
JSStackFrame *fp = cx->fp;
|
||||
JSStackFrame *down = cx->fp->down;
|
||||
if (!down)
|
||||
@ -9663,7 +9660,6 @@ IsTraceableRecursion(JSContext *cx)
|
||||
if ((fp->flags & JSFRAME_CONSTRUCTING) || (down->flags & JSFRAME_CONSTRUCTING))
|
||||
return false;
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
JS_REQUIRES_STACK AbortableRecordingStatus
|
||||
@ -9723,7 +9719,6 @@ TraceRecorder::record_EnterFrame(uintN& inlineCallCount)
|
||||
RETURN_STOP_A("recursion started inlining");
|
||||
}
|
||||
|
||||
#ifdef JS_TRACE_RECURSION
|
||||
VMFragment* root = (VMFragment*)fragment->root;
|
||||
VMFragment* first = getLoop(&JS_TRACE_MONITOR(cx), fp->regs->pc,
|
||||
root->globalObj, root->globalShape, fp->argc);
|
||||
@ -9774,9 +9769,8 @@ TraceRecorder::record_EnterFrame(uintN& inlineCallCount)
|
||||
return ARECORD_ABORTED;
|
||||
return attemptTreeCall(f, inlineCallCount);
|
||||
}
|
||||
#endif
|
||||
|
||||
return ARECORD_CONTINUE;
|
||||
return ARECORD_CONTINUE;
|
||||
}
|
||||
|
||||
JS_REQUIRES_STACK AbortableRecordingStatus
|
||||
|
Loading…
Reference in New Issue
Block a user