Followup to bug 496824 - reverse the order of the asserts so that we know accessing cx->fp is safe
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 08 Jun 2009 17:07:26 -0400
changeset 28998 27739a61e313ef58410eaaa6d09572ff76547a93
parent 28997 2d8dd0494e645218bd291d39f8feb8da0ac29b64
child 28999 8a6e95fb0b031aa49ede73d5d791d66111b9622f
child 29000 ffe1c1a4103b1c9743b1214b9c873a0c6f011908
push id7365
push userrsayre@mozilla.com
push dateTue, 09 Jun 2009 02:39:30 +0000
treeherderautoland@66a40d5fda11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs496824
milestone1.9.2a1pre
Followup to bug 496824 - reverse the order of the asserts so that we know accessing cx->fp is safe
js/src/jsdbgapi.cpp
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1237,18 +1237,18 @@ JS_SetDestroyScriptHook(JSRuntime *rt, J
 /***************************************************************************/
 
 JS_PUBLIC_API(JSBool)
 JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
                           const jschar *chars, uintN length,
                           const char *filename, uintN lineno,
                           jsval *rval)
 {
+    JS_ASSERT_NOT_ON_TRACE(cx);
     JS_ASSERT(cx->fp);
-    JS_ASSERT_NOT_ON_TRACE(cx);
 
     JSObject *scobj;
     JSScript *script;
     JSBool ok;
 
     scobj = JS_GetFrameScopeChain(cx, fp);
     if (!scobj)
         return JS_FALSE;