If lookupProperty fails, recording is already aborted (567068, r=luke).
authorAndreas Gal <gal@mozilla.com>
Mon, 24 May 2010 14:20:19 -0700
changeset 42830 1d52c3dfb311dcc9f8b5c4299753b9a4ab97095d
parent 42829 3c0e96b610a20050ae4d34409f7562aaee5f0a27
child 42831 299580074c1fd89358162b726624634c8a55ac2d
push idunknown
push userunknown
push dateunknown
reviewersluke
bugs567068
milestone1.9.3a5pre
If lookupProperty fails, recording is already aborted (567068, r=luke).
js/src/jstracer.cpp
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -14009,17 +14009,17 @@ TraceRecorder::record_JSOP_IN()
     JSObject* obj2;
     JSProperty* prop;
     JSBool ok = obj->lookupProperty(cx, id, &obj2, &prop);
 
     /* lookupProperty can reenter the interpreter and kill |this|. */
     if (!localtm.recorder) {
         if (prop)
             obj2->dropProperty(localcx, prop);
-        return ARECORD_STOP;
+        return ARECORD_ABORTED;
     }
 
     if (!ok)
         RETURN_ERROR_A("obj->lookupProperty failed in JSOP_IN");
     bool cond = prop != NULL;
     if (prop)
         obj2->dropProperty(cx, prop);