Bug 909499 part 2 - Rename jit::IsEnabled to jit::IsIonEnabled. r=njn

js/src/jit/BaselineIC.cpp

@@ -857,7 +857,7 @@ DoUseCountFallback(JSContext *cx, ICUseCount_Fallback *stub, BaselineFrame *fram
     *infoPtr = NULL;
 
     // A TI OOM will disable TI and Ion.
-    if (!jit::IsEnabled(cx))
+    if (!jit::IsIonEnabled(cx))
         return true;
 
     RootedScript script(cx, frame->script());

js/src/jit/Ion.cpp

@@ -1808,7 +1808,7 @@ static MethodStatus
 Compile(JSContext *cx, HandleScript script, BaselineFrame *osrFrame, jsbytecode *osrPc,
         bool constructing, ExecutionMode executionMode)
 {
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
     JS_ASSERT(jit::IsBaselineEnabled(cx));
     JS_ASSERT_IF(osrPc != NULL, (JSOp)*osrPc == JSOP_LOOPENTRY);
 
@@ -1862,7 +1862,7 @@ MethodStatus
 jit::CanEnterAtBranch(JSContext *cx, JSScript *script, BaselineFrame *osrFrame,
                       jsbytecode *pc, bool isConstructing)
 {
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
     JS_ASSERT((JSOp)*pc == JSOP_LOOPENTRY);
 
     // Skip if the script has been disabled.
@@ -1916,7 +1916,7 @@ jit::CanEnterAtBranch(JSContext *cx, JSScript *script, BaselineFrame *osrFrame,
 MethodStatus
 jit::CanEnter(JSContext *cx, RunState &state)
 {
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
 
     JSScript *script = state.script();
 
@@ -1948,7 +1948,7 @@ jit::CanEnter(JSContext *cx, RunState &state)
             RootedScript scriptRoot(cx, script);
             RootedObject callee(cx, &invoke.args().callee());
             RootedObject obj(cx, CreateThisForFunction(cx, callee, invoke.useNewType()));
-            if (!obj || !jit::IsEnabled(cx)) // Note: OOM under CreateThis can disable TI.
+            if (!obj || !jit::IsIonEnabled(cx)) // Note: OOM under CreateThis can disable TI.
                 return Method_Skipped;
             invoke.args().setThis(ObjectValue(*obj));
             script = scriptRoot;
@@ -1984,7 +1984,7 @@ MethodStatus
 jit::CompileFunctionForBaseline(JSContext *cx, HandleScript script, BaselineFrame *frame,
                                 bool isConstructing)
 {
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
     JS_ASSERT(frame->fun()->nonLazyScript()->canIonCompile());
     JS_ASSERT(!frame->fun()->nonLazyScript()->isIonCompilingOffThread());
     JS_ASSERT(!frame->fun()->nonLazyScript()->hasIonScript());
@@ -2053,7 +2053,7 @@ jit::CanEnterInParallel(JSContext *cx, HandleScript script)
 MethodStatus
 jit::CanEnterUsingFastInvoke(JSContext *cx, HandleScript script, uint32_t numActualArgs)
 {
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
 
     // Skip if the code is expected to result in a bailout.
     if (!script->hasIonScript() || script->ionScript()->bailoutExpected())
@@ -2081,7 +2081,7 @@ static IonExecStatus
 EnterIon(JSContext *cx, EnterJitData &data)
 {
     JS_CHECK_RECURSION(cx, return IonExec_Aborted);
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
     JS_ASSERT(!data.osrFrame);
 
     EnterIonCode enter = cx->runtime()->ionRuntime()->enterIon();
@@ -2196,7 +2196,7 @@ jit::FastInvoke(JSContext *cx, HandleFunction fun, CallArgs &args)
     IonCode *code = ion->method();
     void *jitcode = code->raw();
 
-    JS_ASSERT(jit::IsEnabled(cx));
+    JS_ASSERT(jit::IsIonEnabled(cx));
     JS_ASSERT(!ion->bailoutExpected());
 
     JitActivation activation(cx, /* firstFrameIsConstructing = */false);

js/src/jit/Ion.h

@@ -359,7 +359,7 @@ void AttachFinishedCompilations(JSContext *cx);
 void FinishOffThreadBuilder(IonBuilder *builder);
 
 static inline bool
-IsEnabled(JSContext *cx)
+IsIonEnabled(JSContext *cx)
 {
     return cx->hasOption(JSOPTION_ION) &&
         cx->hasOption(JSOPTION_BASELINE) &&

js/src/jit/shared/BaselineCompiler-shared.cpp

@@ -16,8 +16,8 @@ BaselineCompilerShared::BaselineCompilerShared(JSContext *cx, HandleScript scrip
   : cx(cx),
     script(cx, script),
     pc(script->code),
-    ionCompileable_(jit::IsEnabled(cx) && CanIonCompileScript(cx, script, false)),
-    ionOSRCompileable_(jit::IsEnabled(cx) && CanIonCompileScript(cx, script, true)),
+    ionCompileable_(jit::IsIonEnabled(cx) && CanIonCompileScript(cx, script, false)),
+    ionOSRCompileable_(jit::IsIonEnabled(cx) && CanIonCompileScript(cx, script, true)),
     debugMode_(cx->compartment()->debugMode()),
     analysis_(script),
     frame(cx, script, masm),

js/src/vm/ForkJoin.cpp

@@ -559,8 +559,8 @@ js::ParallelDo::apply()
     //       - Re-enqueue main script and any uncompiled scripts that were called
     // - Too many bailouts: Fallback to sequential
 
-    JS_ASSERT_IF(!jit::IsBaselineEnabled(cx_), !jit::IsEnabled(cx_));
-    if (!jit::IsBaselineEnabled(cx_) || !jit::IsEnabled(cx_))
+    JS_ASSERT_IF(!jit::IsBaselineEnabled(cx_), !jit::IsIonEnabled(cx_));
+    if (!jit::IsBaselineEnabled(cx_) || !jit::IsIonEnabled(cx_))
         return sequentialExecution(true);
 
     SpewBeginOp(cx_, "ParallelDo");
@@ -2151,7 +2151,7 @@ js::InExclusiveParallelSection()
 bool
 js::ParallelTestsShouldPass(JSContext *cx)
 {
-    return jit::IsEnabled(cx) &&
+    return jit::IsIonEnabled(cx) &&
            jit::IsBaselineEnabled(cx) &&
            !jit::js_IonOptions.eagerCompilation &&
            jit::js_IonOptions.baselineUsesBeforeCompile != 0 &&

js/src/vm/Interpreter-inl.h

@@ -681,7 +681,7 @@ class FastInvokeGuard
       , fun_(cx)
       , script_(cx)
 #ifdef JS_ION
-      , useIon_(jit::IsEnabled(cx))
+      , useIon_(jit::IsIonEnabled(cx))
 #endif
     {
         JS_ASSERT(!InParallelSection());

js/src/vm/Interpreter.cpp

@@ -417,7 +417,7 @@ js::RunScript(JSContext *cx, RunState &state)
     SPSEntryMarker marker(cx->runtime());
 
 #ifdef JS_ION
-    if (jit::IsEnabled(cx)) {
+    if (jit::IsIonEnabled(cx)) {
         jit::MethodStatus status = jit::CanEnter(cx, state);
         if (status == jit::Method_Error)
             return false;
@@ -2501,7 +2501,7 @@ BEGIN_CASE(JSOP_FUNCALL)
     if (newType)
         state.setUseNewType();
 
-    if (!newType && jit::IsEnabled(cx)) {
+    if (!newType && jit::IsIonEnabled(cx)) {
         jit::MethodStatus status = jit::CanEnter(cx, state);
         if (status == jit::Method_Error)
             goto error;