Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 22:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the usual --disable-methodjit problems

Browse Source
This commit is contained in:
Bill McCloskey 2011-02-14 19:01:11 -08:00
parent 8370276722
commit b4cd8f9178
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jstracer.cpp
View File

@ -2314,8 +2314,10 @@ TraceRecorder::TraceRecorder(JSContext* cx, TraceMonitor *tm,
JS_ASSERT(globalObj->hasOwnShape()); JS_ASSERT(globalObj->hasOwnShape());
JS_ASSERT(cx->regs->pc == (jsbytecode*)fragment->ip); JS_ASSERT(cx->regs->pc == (jsbytecode*)fragment->ip);
#ifdef JS_METHODJIT
if (TRACE_PROFILER(cx)) if (TRACE_PROFILER(cx))
AbortProfiling(cx); AbortProfiling(cx);
#endif
JS_ASSERT(JS_THREAD_DATA(cx)->onTraceCompartment == NULL); JS_ASSERT(JS_THREAD_DATA(cx)->onTraceCompartment == NULL);
JS_ASSERT(JS_THREAD_DATA(cx)->profilingCompartment == NULL); JS_ASSERT(JS_THREAD_DATA(cx)->profilingCompartment == NULL);
@ -6496,8 +6498,10 @@ TracerState::TracerState(JSContext* cx, TraceMonitor* tm, TreeFragment* f,
prev = tm->tracerState; prev = tm->tracerState;
tm->tracerState = this; tm->tracerState = this;
#ifdef JS_METH
if (TRACE_PROFILER(cx)) if (TRACE_PROFILER(cx))
AbortProfiling(cx); AbortProfiling(cx);
#endif
JS_ASSERT(JS_THREAD_DATA(cx)->onTraceCompartment == NULL); JS_ASSERT(JS_THREAD_DATA(cx)->onTraceCompartment == NULL);
JS_ASSERT(JS_THREAD_DATA(cx)->recordingCompartment == NULL || JS_ASSERT(JS_THREAD_DATA(cx)->recordingCompartment == NULL ||

2
js/src/methodjit/Logging.h
View File

@ -38,7 +38,7 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#if !defined jsjaeger_logging_h__ && defined JS_METHODJIT #if !defined jsjaeger_logging_h__ && (defined JS_METHODJIT || defined JS_TRACER)
#define jsjaeger_logging_h__ #define jsjaeger_logging_h__
#include "prmjtime.h" #include "prmjtime.h"