зеркало из https://github.com/mozilla/gecko-dev.git
Fix ridiculous manual merge error. (r=graydon)
This commit is contained in:
Родитель
d7c58dd819
Коммит
fa1ba98606
|
@ -148,8 +148,7 @@ struct JSTraceMonitor {
|
|||
* last-ditch GC and suppress calls to JS_ReportOutOfMemory.
|
||||
*
|
||||
* !tracecx && !recorder: not on trace
|
||||
* !tracecx && recorder && !recorder->deepAborted: recording
|
||||
* !tracecx && recorder && recorder->deepAborted: deep aborted
|
||||
* !tracecx && recorder: recording
|
||||
* tracecx && !recorder: executing a trace
|
||||
* tracecx && recorder: executing inner loop, recording outer loop
|
||||
*/
|
||||
|
|
|
@ -4100,27 +4100,27 @@ TraceRecorder::compile(JSTraceMonitor* tm)
|
|||
|
||||
if (tm->needFlush) {
|
||||
ResetJIT(cx, FR_DEEP_BAIL);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
if (treeInfo->maxNativeStackSlots >= MAX_NATIVE_STACK_SLOTS) {
|
||||
debug_only_print0(LC_TMTracer, "Blacklist: excessive stack use.\n");
|
||||
Blacklist((jsbytecode*) fragment->root->ip);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
if (anchor && anchor->exitType != CASE_EXIT)
|
||||
++treeInfo->branchCount;
|
||||
if (outOfMemory())
|
||||
return true;
|
||||
return false;
|
||||
|
||||
Assembler *assm = tm->assembler;
|
||||
nanojit::compile(assm, fragment verbose_only(, tempAlloc, tm->labels));
|
||||
if (outOfMemory())
|
||||
return true;
|
||||
return false;
|
||||
|
||||
if (assm->error() != nanojit::None) {
|
||||
debug_only_print0(LC_TMTracer, "Blacklisted: error during compilation\n");
|
||||
Blacklist((jsbytecode*) fragment->root->ip);
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
ResetRecordingAttempts(cx, (jsbytecode*) fragment->ip);
|
||||
ResetRecordingAttempts(cx, (jsbytecode*) fragment->root->ip);
|
||||
|
|
Загрузка…
Ссылка в новой задаче