Style drive-by (no bug, r=me).

This commit is contained in:
David Anderson 2012-07-16 13:19:13 -07:00
parent c36e0f89e0
commit e348beac64
3 changed files with 9 additions and 7 deletions

View File

@ -1023,7 +1023,7 @@ ion::CanEnterAtBranch(JSContext *cx, JSScript *script, StackFrame *fp, jsbytecod
MethodStatus status = Compile(cx, script, fp, pc);
if (status != Method_Compiled) {
if (status == Method_CantCompile)
ion::forbidIonCompilation(script);
ForbidCompilation(script);
return status;
}
@ -1068,7 +1068,7 @@ ion::CanEnter(JSContext *cx, JSScript *script, StackFrame *fp, bool newType)
MethodStatus status = Compile(cx, script, fp, NULL);
if (status != Method_Compiled) {
if (status == Method_CantCompile)
ion::forbidIonCompilation(script);
ForbidCompilation(script);
return status;
}
@ -1392,11 +1392,13 @@ ion::MarkFromIon(JSCompartment *comp, Value *vp)
gc::MarkValueUnbarriered(comp->barrierTracer(), vp, "write barrier");
}
int js::ion::LabelBase::id_count = 0;
void ion::forbidIonCompilation(JSScript *script)
void
ion::ForbidCompilation(JSScript *script)
{
IonSpew(IonSpew_Abort, "Disabling Ion compilation of script %s:%d",
script->filename, script->lineno);
script->ion = ION_DISABLED_SCRIPT;
}
int js::ion::LabelBase::id_count = 0;

View File

@ -263,7 +263,7 @@ static inline bool IsEnabled(JSContext *cx)
return cx->hasRunOption(JSOPTION_ION) && cx->typeInferenceEnabled();
}
void forbidIonCompilation(JSScript *script);
void ForbidCompilation(JSScript *script);
} // namespace ion
} // namespace js

View File

@ -128,7 +128,7 @@ fun_getProperty(JSContext *cx, HandleObject obj_, HandleId id, Value *vp)
// detecting its use early.
JSScript *script = iter.script();
if (!script->hasIonScript())
ion::forbidIonCompilation(script);
ion::ForbidCompilation(script);
#endif
*vp = ObjectValue(*argsobj);