Bug 622503 - Build failure when JS_TRACER is not defined r=gal, gregor
authorEric Hennigan <eric.hennigan@uci.edu>
Thu, 06 Jan 2011 06:13:48 -0800
changeset 60170 4dadcbc5c41efe08c49d35dcdc82464ed061c926
parent 60169 f75602c6e52119670345e5e00161710ca07e1b1c
child 60171 d13654bb28f1f863727a3420fb24b54611630528
push id17881
push usercleary@mozilla.com
push dateFri, 07 Jan 2011 19:57:21 +0000
treeherdermozilla-central@54576be62860 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgal, gregor
bugs622503
milestone2.0b9pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 622503 - Build failure when JS_TRACER is not defined r=gal, gregor
js/src/jscntxt.cpp
js/src/jscompartment.cpp
js/src/jsdbgapi.cpp
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -496,19 +496,21 @@ JSThreadData::init()
         return false;
     dtoaState = js_NewDtoaState();
     if (!dtoaState) {
         finish();
         return false;
     }
     nativeStackBase = GetNativeStackBase();
 
+#ifdef JS_TRACER
     /* Set the default size for the code cache to 16MB. */
     maxCodeCacheBytes = 16 * 1024 * 1024;
-    
+#endif
+
     return true;
 }
 
 void
 JSThreadData::finish()
 {
     if (dtoaState)
         js_DestroyDtoaState(dtoaState);
--- a/js/src/jscompartment.cpp
+++ b/js/src/jscompartment.cpp
@@ -366,16 +366,17 @@ JSCompartment::wrapException(JSContext *
             cx->throwing = true;
             cx->exception = tvr.value();
         }
         return false;
     }
     return true;
 }
 
+#if defined JS_METHODJIT && defined JS_MONOIC
 /*
  * Check if the pool containing the code for jit should be destroyed, per the
  * heuristics in JSCompartment::sweep.
  */
 static inline bool
 ScriptPoolDestroyed(JSContext *cx, mjit::JITScript *jit,
                     uint32 releaseInterval, uint32 &counter)
 {
@@ -390,16 +391,17 @@ ScriptPoolDestroyed(JSContext *cx, mjit:
         pool->m_gcNumber = cx->runtime->gcNumber;
         if (--counter == 0) {
             pool->m_destroy = true;
             counter = releaseInterval;
         }
     }
     return pool->m_destroy;
 }
+#endif
 
 void
 JSCompartment::sweep(JSContext *cx, uint32 releaseInterval)
 {
     chunk = NULL;
     /* Remove dead wrappers from the table. */
     for (WrapperMap::Enum e(crossCompartmentWrappers); !e.empty(); e.popFront()) {
         JS_ASSERT_IF(IsAboutToBeFinalized(e.front().key.toGCThing()) &&
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -181,18 +181,20 @@ JS_SetDebugMode(JSContext *cx, JSBool de
 #endif
 
     return js_SetDebugMode(cx, debug);
 }
 
 JS_FRIEND_API(JSBool)
 js_SetSingleStepMode(JSContext *cx, JSScript *script, JSBool singleStep)
 {
+#ifdef JS_METHODJIT
     if (!script->singleStepMode == !singleStep)
         return JS_TRUE;
+#endif
 
     JS_ASSERT_IF(singleStep, cx->compartment->debugMode);
 
 #ifdef JS_METHODJIT
     /* request the next recompile to inject single step interrupts */
     script->singleStepMode = !!singleStep;
 
     js::mjit::JITScript *jit = script->jitNormal ? script->jitNormal : script->jitCtor;