Bug 939614: IonMonkey: Revert hoisting of setting ION_COMPILING_SCRIPT. We can only set this when background compiling, r=jandem

This commit is contained in:
Hannes Verschore 2013-12-19 16:42:37 +01:00
parent 5a6c7540bb
commit 4a339da06f

View File

@ -1716,12 +1716,13 @@ IonCompile(JSContext *cx, JSScript *script,
if (recompile) {
JS_ASSERT(executionMode == SequentialExecution);
builderScript->ionScript()->setRecompiling();
} else {
SetIonScript(builder->script(), executionMode, ION_COMPILING_SCRIPT);
}
// If possible, compile the script off thread.
if (OffThreadCompilationAvailable(cx)) {
if (!recompile)
SetIonScript(builder->script(), executionMode, ION_COMPILING_SCRIPT);
if (!StartOffThreadIonCompile(cx, builder)) {
IonSpew(IonSpew_Abort, "Unable to start off-thread ion compilation.");
return AbortReason_Alloc;