From e6e72b40a9f87858e5f57b4aab7f36fff34ffe99 Mon Sep 17 00:00:00 2001
From: Cameron Kaiser <spectre>
Date: Sat, 8 Jan 2011 22:42:00 -0800
Subject: [PATCH] Bug 623277 - Failed to build with --disable-methodjit 
 r=dmandelin, a=NPOTB

---
 js/src/jsdbgapi.cpp      | 4 ++--
 js/src/jsinterpinlines.h | 4 ++++
 js/src/shell/js.cpp      | 6 +++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index 9f97ae51ad93..cd3dc25a7c45 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -116,10 +116,10 @@ JS_SetRuntimeDebugMode(JSRuntime *rt, JSBool debug)
     rt->debugMode = debug;
 }
 
+#ifdef JS_METHODJIT
 static void
 PurgeCallICs(JSContext *cx, JSScript *start)
 {
-#ifdef JS_METHODJIT
     for (JSScript *script = start;
          &script->links != &cx->compartment->scripts;
          script = (JSScript *)script->links.next)
@@ -135,8 +135,8 @@ PurgeCallICs(JSContext *cx, JSScript *start)
         if (script->jitCtor)
             script->jitCtor->nukeScriptDependentICs();
     }
-#endif
 }
+#endif
 
 JS_FRIEND_API(JSBool)
 js_SetDebugMode(JSContext *cx, JSBool debug)
diff --git a/js/src/jsinterpinlines.h b/js/src/jsinterpinlines.h
index d83ff45a0ec3..b414933b4bf0 100644
--- a/js/src/jsinterpinlines.h
+++ b/js/src/jsinterpinlines.h
@@ -586,7 +586,11 @@ InvokeSessionGuard::invoke(JSContext *cx) const
     formals_[-1] = savedThis_;
 
     void *code;
+#ifdef JS_METHODJIT
     if (!optimized() || !(code = script_->getJIT(false /* !constructing */)->invokeEntry))
+#else
+    if (!optimized())
+#endif
         return Invoke(cx, args_, 0);
 
     /* Clear any garbage left from the last Invoke. */
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 592243700ed3..536409b33826 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4250,7 +4250,11 @@ Deserialize(JSContext *cx, uintN argc, jsval *vp)
 JSBool
 MJitStats(JSContext *cx, uintN argc, jsval *vp)
 {
-    JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed));
+#ifdef JS_METHODJIT
+     JS_SET_RVAL(cx, vp, INT_TO_JSVAL(cx->runtime->mjitMemoryUsed));
+#else
+    JS_SET_RVAL(cx, vp, JSVAL_VOID);
+#endif
     return true;
 }