Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bustage for mjit-disabled, tjit-disabled, and Linux64 warnings-as-errors.

Browse Source
This commit is contained in:
Brian Hackett 2011-08-30 08:03:34 -07:00
parent 638cc44627
commit 316be0eb11
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jscompartment.cpp
View File

@ -585,6 +585,8 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
}
# endif
bool discardScripts = !active && (releaseInterval != 0 || hasDebugModeCodeToDrop);
#if defined JS_METHODJIT && defined JS_MONOIC
/*
@ -595,7 +597,6 @@ JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
* for compartments which currently have active stack frames.
*/
uint32 counter = 1;
bool discardScripts = !active && (releaseInterval != 0 || hasDebugModeCodeToDrop);
if (discardScripts)
hasDebugModeCodeToDrop = false;

6
js/src/jsinfer.cpp
View File

@ -2017,8 +2017,7 @@ TypeCompartment::setPendingNukeTypes(JSContext *cx)
void
TypeCompartment::nukeTypes(JSContext *cx)
{
JSCompartment *compartment = cx->compartment;
JS_ASSERT(this == &compartment->types);
JS_ASSERT(this == &cx->compartment->types);
/*
* This is the usual response if we encounter an OOM while adding a type
@ -2060,7 +2059,8 @@ TypeCompartment::nukeTypes(JSContext *cx)
#ifdef JS_METHODJIT
mjit::ExpandInlineFrames(cx->compartment);
JSCompartment *compartment = cx->compartment;
mjit::ExpandInlineFrames(compartment);
/* Throw away all JIT code in the compartment, but leave everything else alone. */
for (JSCList *cursor = compartment->scripts.next;

4
js/src/jsinterp.cpp
View File

@ -1936,6 +1936,8 @@ Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
#define MONITOR_BRANCH_TRACEVIS
#endif
#endif /* !JS_TRACER */
#define RESTORE_INTERP_VARS() \
JS_BEGIN_MACRO \
SET_SCRIPT(regs.fp()->script()); \
@ -1954,8 +1956,6 @@ Interpret(JSContext *cx, StackFrame *entryFrame, InterpMode interpMode)
CHECK_INTERRUPT_HANDLER(); \
JS_END_MACRO
#endif /* !JS_TRACER */
/*
* Prepare to call a user-supplied branch handler, and abort the script
* if it returns false.

2
js/src/methodjit/Compiler.cpp
View File

@ -6359,7 +6359,7 @@ mjit::Compiler::finishLoop(jsbytecode *head)
#ifdef DEBUG
if (IsJaegerSpewChannelActive(JSpew_Regalloc)) {
RegisterAllocation *alloc = analysis->getAllocation(head);
JaegerSpew(JSpew_Regalloc, "loop allocation at %u:", head - script->code);
JaegerSpew(JSpew_Regalloc, "loop allocation at %u:", unsigned(head - script->code));
frame.dumpAllocation(alloc);
}
#endif

4
js/src/methodjit/FrameState.cpp
View File

@ -584,7 +584,7 @@ FrameState::computeAllocation(jsbytecode *target)
/* State must be synced at exception and switch targets, and at traps. */
#ifdef DEBUG
if (IsJaegerSpewChannelActive(JSpew_Regalloc)) {
JaegerSpew(JSpew_Regalloc, "allocation at %u:", target - a->script->code);
JaegerSpew(JSpew_Regalloc, "allocation at %u:", unsigned(target - a->script->code));
dumpAllocation(alloc);
}
#endif
@ -635,7 +635,7 @@ FrameState::computeAllocation(jsbytecode *target)
#ifdef DEBUG
if (IsJaegerSpewChannelActive(JSpew_Regalloc)) {
JaegerSpew(JSpew_Regalloc, "allocation at %u:", target - a->script->code);
JaegerSpew(JSpew_Regalloc, "allocation at %u:", unsigned(target - a->script->code));
dumpAllocation(alloc);
}
#endif