Bug 587809 final: fix nits in version 'pre-landed' on JM, r=jorendorff

js/src/jstracer.cpp

@@ -9909,20 +9909,20 @@ TraceRecorder::getThis(LIns*& this_ins)
         // object, which we can burn into the trace.
 
         JS_ASSERT(!fp->argv);
-        JS_ASSERT(!fp->getThisValue().isPrimitive());
+        JS_ASSERT(fp->getThisValue().isObject());
 
 #ifdef DEBUG
         JSObject *obj = globalObj->thisObject(cx);
         if (!obj)
             RETURN_ERROR("thisObject hook failed");
-        JS_ASSERT(fp->getThisValue().toObjectOrNull() == obj);
+        JS_ASSERT(&fp->getThisValue().toObject() == obj);
 #endif
 
-        this_ins = INS_CONSTOBJ(fp->getThisValue().toObjectOrNull());
+        this_ins = INS_CONSTOBJ(&fp->getThisValue().toObject());
         return RECORD_CONTINUE;
     }
 
-    Value& thisv = fp->argv[-1];
+    const Value& thisv = fp->argv[-1];
     JS_ASSERT(thisv == fp->getThisValue() || fp->getThisValue().isNull());
 
     JS_ASSERT(fp->callee()->getGlobal() == globalObj);
@@ -9945,7 +9945,7 @@ TraceRecorder::getThis(LIns*& this_ins)
     JSObject *obj = fp->getThisObject(cx);
     if (!obj)
         RETURN_ERROR("getThisObject failed");
-    JS_ASSERT(fp->argv[-1] == ObjectOrNullValue(obj));
+    JS_ASSERT(fp->argv[-1] == ObjectValue(*obj));
     this_ins = INS_CONSTOBJ(obj);
     set(&fp->argv[-1], this_ins);
     return RECORD_CONTINUE;