Backout 4a66a93f8625 for causing mochitest failures.
authorGary Kwong <gary@rumblingedge.com>
Wed, 26 Dec 2012 17:59:46 -0800
changeset 126180 9afe210481680c275666953c9830fddf2366fc95
parent 126179 a13cadb983fb1f05f9998e22ff375e90e4a9ad62
child 126181 4a7071b920691e2ac545cb59a3fc074d4b904640
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.0a1
backs out4a66a93f862572a993ec90cb9b11919b9a7d8d96
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 4a66a93f8625 for causing mochitest failures.
js/src/jsinferinlines.h
--- a/js/src/jsinferinlines.h
+++ b/js/src/jsinferinlines.h
@@ -436,42 +436,35 @@ struct AutoEnterCompilation
         if (!types.constrainedOutputs) {
             types.constrainedOutputs = cx->new_< Vector<CompilerOutput> >(cx);
             if (!types.constrainedOutputs) {
                 types.setPendingNukeTypes(cx);
                 return false;
             }
         }
 
-        info.outputIndex = types.constrainedOutputs->length();
+        info.outputIndex = cx->compartment->types.constrainedOutputs->length();
         // I hope we GC before we reach 64k of compilation attempts.
         if (info.outputIndex >= RecompileInfo::NoCompilerRunning)
             return false;
 
-        if (!types.constrainedOutputs->append(co)) {
-            info.outputIndex = RecompileInfo::NoCompilerRunning;
+        if (!cx->compartment->types.constrainedOutputs->append(co))
             return false;
-        }
         return true;
     }
 
     void initExisting(RecompileInfo oldInfo)
     {
         // Initialize the active compilation index from that produced during a
         // previous compilation, for finishing an off thread compilation.
         info = oldInfo;
     }
 
     ~AutoEnterCompilation()
     {
-        // Handle failure cases of init.
-        if (info.outputIndex >= RecompileInfo::NoCompilerRunning)
-            return;
-
-        JS_ASSERT(info.outputIndex + 1 == cx->compartment->types.constrainedOutputs->length());
         CompilerOutput *co = info.compilerOutput(cx);
         co->pendingRecompilation = false;
         if (!co->isValid())
             co->invalidate();
 
         info.outputIndex = RecompileInfo::NoCompilerRunning;
     }
 };