Bug 623277 - Failed to build with --disable-methodjit r=dmandelin, a=NPOTB

This commit is contained in:
Cameron Kaiser 2011-01-08 22:42:00 -08:00
parent a9577c45b8
commit e6e72b40a9
3 changed files with 11 additions and 3 deletions

View File

@ -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)

View File

@ -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. */

View File

@ -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;
}