Backed out changeset 6e1d68784ae3 (bug 1242462) for what appears to be permafail in browser_CTP_crashreporting.js CLOSED TREE

--HG--
extra : commitid : FP9DCkBVf8Y

js/src/jit/Bailouts.cpp

@@ -280,7 +280,7 @@ jit::CheckFrequentBailouts(JSContext* cx, JSScript* script, BailoutKind bailoutK
         // we compile this script LICM will be disabled.
         IonScript* ionScript = script->ionScript();
 
-        if (ionScript->bailoutExpected()) {
+        if (ionScript->numBailouts() >= JitOptions.frequentBailoutThreshold) {
             // If we bailout because of the first execution of a basic block,
             // then we should record which basic block we are returning in,
             // which should prevent this from happening again.  Also note that

js/src/jit/IonCode.h

@@ -418,8 +418,11 @@ struct IonScript
     void incNumBailouts() {
         numBailouts_++;
     }
+    uint32_t numBailouts() const {
+        return numBailouts_;
+    }
     bool bailoutExpected() const {
-        return numBailouts_ >= JitOptions.frequentBailoutThreshold;
+        return numBailouts_ > 0;
     }
     void setHasProfilingInstrumentation() {
         hasProfilingInstrumentation_ = true;