Bug 739512: Patch 10: add JSScripts::hasConsts() et al. r=dvander.

This commit is contained in:
Nicholas Nethercote
2012-04-10 23:51:10 -07:00
parent 649584fb18
commit b57b167f48
11 changed files with 39 additions and 33 deletions

View File

@@ -112,7 +112,7 @@ DefineGlobals(JSContext *cx, GlobalScope &globalScope, JSScript* script)
JSScript *outer = worklist.back();
worklist.popBack();
if (JSScript::isValidOffset(outer->objectsOffset)) {
if (outer->hasObjects()) {
JSObjectArray *arr = outer->objects();
/*
@@ -132,16 +132,14 @@ DefineGlobals(JSContext *cx, GlobalScope &globalScope, JSScript* script)
outer->isOuterFunction = true;
inner->isInnerFunction = true;
}
if (!JSScript::isValidOffset(inner->globalsOffset) &&
!JSScript::isValidOffset(inner->objectsOffset)) {
if (!inner->hasGlobals() && !inner->hasObjects())
continue;
}
if (!worklist.append(inner))
return false;
}
}
if (!JSScript::isValidOffset(outer->globalsOffset))
if (!outer->hasGlobals())
continue;
GlobalSlotArray *globalUses = outer->globals();