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

This commit is contained in:
Jason Orendorff 2009-02-25 11:42:39 -06:00
parent e926dd01b6
commit ee738867c8
2 changed files with 9 additions and 6 deletions

View File

@ -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;
}
}
/*

View File

@ -1179,7 +1179,7 @@ mergeTypeMaps(uint8** partial, unsigned* plength, uint8* complete, unsigned clen
}
/* Specializes a tree to any missing globals, including any dependent trees. */
static void
static JS_REQUIRES_STACK void
specializeTreesToMissingGlobals(JSContext* cx, TreeInfo* root)
{
TreeInfo* ti = root;