Back out changeset 16a18faa5363 (bug 1273955) for causing frequent timeouts in browser_wa_destroy-node-01.js

CLOSED TREE

js/src/jit/IonOptimizationLevels.cpp

@@ -40,11 +40,11 @@ OptimizationInfo::initNormalOptimizationInfo()
 
     registerAllocator_ = RegisterAllocator_Backtracking;
 
-    inlineMaxBytecodePerCallSiteMainThread_ = 550;
-    inlineMaxBytecodePerCallSiteOffThread_ = 1100;
-    inlineMaxCalleeInlinedBytecodeLength_ = 3550;
-    inlineMaxTotalBytecodeLength_ = 85000;
-    inliningMaxCallerBytecodeLength_ = 1600;
+    inlineMaxBytecodePerCallSiteMainThread_ = 500;
+    inlineMaxBytecodePerCallSiteOffThread_ = 1000;
+    inlineMaxCalleeInlinedBytecodeLength_ = 3350;
+    inlineMaxTotalBytecodeLength_ = 80000;
+    inliningMaxCallerBytecodeLength_ = 1500;
     maxInlineDepth_ = 3;
     scalarReplacement_ = true;
     smallFunctionMaxInlineDepth_ = 10;

js/src/jit/JitOptions.cpp

@@ -166,7 +166,7 @@ DefaultJitOptions::DefaultJitOptions()
     SET_DEFAULT(osrPcMismatchesBeforeRecompile, 6000);
 
     // The bytecode length limit for small function.
-    SET_DEFAULT(smallFunctionMaxBytecodeLength_, 130);
+    SET_DEFAULT(smallFunctionMaxBytecodeLength_, 120);
 
     // An artificial testing limit for the maximum supported offset of
     // pc-relative jump and call instructions.