Bug 1166037 - Follow-up - Revert SimulatorType to Simulator. no_r=me
authorSean Stangl <sstangl@mozilla.com>
Wed, 10 Jun 2015 15:33:21 -0700
changeset 248189 f88e60f3954c5dc0729a4a5e4f16c382726c5e2c
parent 248188 31ba39bfadb09ebb61559372d572b9e32c0e2bba
child 248190 a3afb20a8fd29b7efef8f23cfe09f0ed0f6a656e
push id28893
push userkwierso@gmail.com
push dateFri, 12 Jun 2015 00:02:58 +0000
treeherderautoland@8cf9d3e497f9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1166037
milestone41.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 1166037 - Follow-up - Revert SimulatorType to Simulator. no_r=me
js/src/jit/BaselineBailouts.cpp
--- a/js/src/jit/BaselineBailouts.cpp
+++ b/js/src/jit/BaselineBailouts.cpp
@@ -1568,17 +1568,17 @@ jit::BailoutIonToBaseline(JSContext* cx,
         mozilla::PodCopy(argv, startFrameFormals.begin(), startFrameFormals.length());
     }
 
     // Do stack check.
     bool overRecursed = false;
     BaselineBailoutInfo *info = builder.info();
     uint8_t* newsp = info->incomingStack - (info->copyStackTop - info->copyStackBottom);
 #if defined(JS_ARM_SIMULATOR) || defined(JS_ARM64_SIMULATOR) || defined(JS_MIPS_SIMULATOR)
-    if (SimulatorType::Current()->overRecursed(uintptr_t(newsp)))
+    if (Simulator::Current()->overRecursed(uintptr_t(newsp)))
         overRecursed = true;
 #else
     JS_CHECK_RECURSION_WITH_SP_DONT_REPORT(cx, newsp, overRecursed = true);
 #endif
     if (overRecursed) {
         JitSpew(JitSpew_BaselineBailouts, "  Overrecursion check failed!");
         return BAILOUT_RETURN_OVERRECURSED;
     }