Bug 1142669 part 1 - Fix inliningMaxCallerBytecodeLength to return the correct value. r=h4writer
authorJan de Mooij <jdemooij@mozilla.com>
Fri, 20 Mar 2015 13:45:35 +0100
changeset 263580 1c9568d7d26f6e3c005f4a68c5ca9d0fabd7657d
parent 263579 02c4c1b559ac724ca9cecdde22011a46595ec712
child 263581 310b3af47e938a352a28bb3b31ebbaf8d9c30967
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersh4writer
bugs1142669
milestone39.0a1
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
Bug 1142669 part 1 - Fix inliningMaxCallerBytecodeLength to return the correct value. r=h4writer
js/src/jit/IonOptimizationLevels.h
--- a/js/src/jit/IonOptimizationLevels.h
+++ b/js/src/jit/IonOptimizationLevels.h
@@ -209,17 +209,17 @@ class OptimizationInfo
         return maxInlineDepth_;
     }
 
     uint32_t inlineMaxTotalBytecodeLength() const {
         return inlineMaxTotalBytecodeLength_;
     }
 
     uint32_t inliningMaxCallerBytecodeLength() const {
-        return inlineMaxTotalBytecodeLength_;
+        return inliningMaxCallerBytecodeLength_;
     }
 
     uint32_t inliningWarmUpThreshold() const {
         uint32_t compilerWarmUpThreshold = compilerWarmUpThreshold_;
         if (js_JitOptions.forcedDefaultIonWarmUpThreshold.isSome())
             compilerWarmUpThreshold = js_JitOptions.forcedDefaultIonWarmUpThreshold.ref();
         return compilerWarmUpThreshold * inliningWarmUpThresholdFactor_;
     }