Add #ifdef JS_ION to fix --disable-ion bustage (no bug, r=me)
authorLuke Wagner <luke@mozilla.com>
Thu, 24 Oct 2013 10:39:07 -0500
changeset 166748 2becacaadf0bb3a9b5b23d5145c8ec39ac2201f3
parent 166747 168ec48380971c95dfc73c46f225a400654ad9ab
child 166749 236bd39eb36c01d268c85a3c8a4e1563dbec55f7
push id428
push userbbajaj@mozilla.com
push dateTue, 28 Jan 2014 00:16:25 +0000
treeherdermozilla-release@cd72a7ff3a75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
milestone27.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
Add #ifdef JS_ION to fix --disable-ion bustage (no bug, r=me)
js/src/builtin/TestingFunctions.cpp
js/src/vm/TypedArrayObject.cpp
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -917,17 +917,17 @@ DisableSPSProfiling(JSContext *cx, unsig
     if (cx->runtime()->spsProfiler.installed())
         cx->runtime()->spsProfiler.enable(false);
     return true;
 }
 
 static bool
 EnableOsiPointRegisterChecks(JSContext *, unsigned, jsval *vp)
 {
-#ifdef CHECK_OSIPOINT_REGISTERS
+#if defined(JS_ION) && defined(CHECK_OSIPOINT_REGISTERS)
     jit::js_IonOptions.checkOsiPointRegisters = true;
 #endif
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return true;
 }
 
 static bool
 DisplayName(JSContext *cx, unsigned argc, jsval *vp)
@@ -1086,17 +1086,19 @@ SetJitCompilerOption(JSContext *cx, unsi
     args.rval().setBoolean(true);
     return true;
 }
 
 static bool
 SetIonAssertGraphCoherency(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
+#ifdef JS_ION
     jit::js_IonOptions.assertGraphConsistency = ToBoolean(args.get(0));
+#endif
     args.rval().setUndefined();
     return true;
 }
 
 class CloneBufferObject : public JSObject {
     static const JSPropertySpec props_[2];
     static const size_t DATA_SLOT   = 0;
     static const size_t LENGTH_SLOT = 1;
--- a/js/src/vm/TypedArrayObject.cpp
+++ b/js/src/vm/TypedArrayObject.cpp
@@ -551,26 +551,30 @@ ArrayBufferObject::releaseAsmJSArrayBuff
 {
     fop->free_(obj->as<ArrayBufferObject>().getElementsHeader());
 }
 #endif
 
 bool
 ArrayBufferObject::neuterAsmJSArrayBuffer(JSContext *cx, ArrayBufferObject &buffer)
 {
+#ifdef JS_ION
     AsmJSActivation *act = cx->mainThread().asmJSActivationStackFromOwnerThread();
     for (; act; act = act->prev()) {
         if (act->module().maybeHeapBufferObject() == &buffer)
             break;
     }
     if (!act)
         return true;
 
     js_ReportOverRecursed(cx);
     return false;
+#else
+    return true;
+#endif
 }
 
 void
 ArrayBufferObject::addView(ArrayBufferViewObject *view)
 {
     // This view should never have been associated with a buffer before
     JS_ASSERT(view->bufferLink() == UNSET_BUFFER_LINK);