Tracer build fixes. (b=588021, r=dvander)
authorChris Leary <cdleary@mozilla.com>
Tue, 23 Nov 2010 13:58:34 -0800
changeset 58283 9e628f0c5b100f5f9083e2189df4adcbd4e8a363
parent 58282 fe0e393e35303dfcf2923a647e9fcaad7de2b96a
child 58284 96c9432d41cf7349f7a9a5422d14e9910fc6133e
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersdvander
bugs588021
milestone2.0b8pre
Tracer build fixes. (b=588021, r=dvander)
js/src/jsarray.cpp
js/src/jsobj.cpp
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2043,28 +2043,30 @@ ArrayCompPushImpl(JSContext *cx, JSObjec
 }
 
 JSBool
 js_ArrayCompPush(JSContext *cx, JSObject *obj, const Value &vp)
 {
     return ArrayCompPushImpl(cx, obj, vp);
 }
 
+#ifdef JS_TRACER
 JSBool JS_FASTCALL
 js_ArrayCompPush_tn(JSContext *cx, JSObject *obj, ValueArgType v)
 {
     if (!ArrayCompPushImpl(cx, obj, ValueArgToConstRef(v))) {
         SetBuiltinError(cx);
         return JS_FALSE;
     }
 
     return cx->tracerState->builtinStatus == 0;
 }
 JS_DEFINE_CALLINFO_3(extern, BOOL_FAIL, js_ArrayCompPush_tn, CONTEXT, OBJECT,
                      VALUE, 0, nanojit::ACCSET_STORE_ANY)
+#endif
 
 static JSBool
 array_push(JSContext *cx, uintN argc, Value *vp)
 {
     /* Insist on one argument and obj of the expected class. */
     JSObject *obj = ComputeThisFromVp(cx, vp);
     if (!obj)
         return JS_FALSE;
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -4481,17 +4481,19 @@ js_DefineNativeProperty(JSContext *cx, J
 #endif
             JS_PROPERTY_CACHE(cx).fill(cx, obj, 0, 0, obj, shape, added);
         TRACE_2(SetPropHit, entry, shape);
     }
     if (propp)
         *propp = (JSProperty *) shape;
     return true;
 
+#ifdef JS_TRACER
 error: // TRACE_2 jumps here on error.
+#endif
     return false;
 }
 
 #define SCOPE_DEPTH_ACCUM(bs,val)                                             \
     JS_SCOPE_DEPTH_METERING(JS_BASIC_STATS_ACCUM(bs, val))
 
 /*
  * Call obj's resolve hook. obj is a native object and the caller holds its