Bug 480126 - jsstack.js static analysis errors in js_GetCurrentBytecodePC and specializeTreesToMissingGlobals. r=bsmedberg.

2009-02-25 11:42:39 -06:00
parent 710a5b301c
commit d7e90ef374
2 changed files with 9 additions and 6 deletions
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -3945,11 +3945,14 @@ js_GetCurrentBytecodePC(JSContext* cx)
        imacpc = cx->bailExit->imacpc;
    } else
 #endif
-    if (cx->fp && cx->fp->regs) {
-        pc = cx->fp->regs->pc;
-        imacpc = cx->fp->imacpc;
-    } else {
-        return NULL;
+    {
+        JS_ASSERT_NOT_ON_TRACE(cx);  /* for static analysis */
+        if (cx->fp && cx->fp->regs) {
+            pc = cx->fp->regs->pc;
+            imacpc = cx->fp->imacpc;
+        } else {
+            return NULL;
+        }
    }

    /*