(debug-only bug) abort recording in js_Interpret after setting fp->regs (r=dvander)

js/src/jsinterp.cpp

@@ -2787,12 +2787,6 @@ js_Interpret(JSContext *cx)
 
 #endif /* !JS_THREADED_INTERP */
 
-#ifdef JS_TRACER
-    /* We cannot reenter the interpreter while recording. */
-    if (TRACE_RECORDER(cx))
-        js_AbortRecording(cx, "attempt to reenter interpreter while recording");
-#endif
-
     /* Check for too deep of a native thread stack. */
     JS_CHECK_RECURSION(cx, return JS_FALSE);
 
@@ -2989,6 +2983,15 @@ js_Interpret(JSContext *cx)
     }
 #endif /* JS_HAS_GENERATORS */
 
+#ifdef JS_TRACER
+    /*
+     * We cannot reenter the interpreter while recording; wait to abort until
+     * after cx->fp->regs is set.
+     */
+    if (TRACE_RECORDER(cx))
+        js_AbortRecording(cx, "attempt to reenter interpreter while recording");
+#endif
+
     /*
      * It is important that "op" be initialized before calling DO_OP because
      * it is possible for "op" to be specially assigned during the normal