Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 754180 - Give ObjectBox and FunctionBox constructors. r=jorendorff.

Browse Source
This commit is contained in:
Nicholas Nethercote 2012-05-16 18:42:34 -07:00
parent 5a5f63981b
commit fd4271cf1c
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/frontend/ParseNode.h
View File

@ -1529,6 +1529,8 @@ struct ObjectBox {
ObjectBox *emitLink;
JSObject *object;
bool isFunctionBox;
ObjectBox(ObjectBox *traceLink, JSObject *obj);
};
#define JSFB_LEVEL_BITS 14
@ -1549,6 +1551,8 @@ struct FunctionBox : public ObjectBox
ContextFlags cxFlags;
FunctionBox(ObjectBox* traceListHead, JSObject *obj, ParseNode *fn, TreeContext *tc);
bool funIsHeavyweight() const { return cxFlags.funIsHeavyweight; }
bool funIsGenerator() const { return cxFlags.funIsGenerator; }
bool funHasExtensibleScope() const { return cxFlags.funHasExtensibleScope; }

84
js/src/frontend/Parser.cpp
View File

@ -169,6 +169,14 @@ Parser::setPrincipals(JSPrincipals *prin, JSPrincipals *originPrin)
JS_HoldPrincipals(originPrincipals);
}
ObjectBox::ObjectBox(ObjectBox* traceLink, JSObject *obj)
: traceLink(traceLink),
emitLink(NULL),
object(obj),
isFunctionBox(false)
{
}
ObjectBox *
Parser::newObjectBox(JSObject *obj)
{
@ -181,19 +189,49 @@ Parser::newObjectBox(JSObject *obj)
* scanning, parsing and code generation for the whole script or top-level
* function.
*/
ObjectBox *objbox = context->tempLifoAlloc().new_<ObjectBox>();
ObjectBox *objbox = context->tempLifoAlloc().new_<ObjectBox>(traceListHead, obj);
if (!objbox) {
js_ReportOutOfMemory(context);
return NULL;
}
objbox->traceLink = traceListHead;
traceListHead = objbox;
objbox->emitLink = NULL;
objbox->object = obj;
objbox->isFunctionBox = false;
return objbox;
}
FunctionBox::FunctionBox(ObjectBox* traceListHead, JSObject *obj, ParseNode *fn, TreeContext *tc)
: ObjectBox(traceListHead, obj),
node(fn),
siblings(tc->sc->functionList),
kids(NULL),
parent(tc->sc->funbox),
bindings(tc->sc->context),
level(tc->sc->staticLevel),
queued(false),
inLoop(false),
inWith(!!tc->innermostWith),
inGenexpLambda(false),
cxFlags(tc->sc->context) // the cxFlags are set in LeaveFunction
{
isFunctionBox = true;
for (StmtInfo *stmt = tc->sc->topStmt; stmt; stmt = stmt->down) {
if (STMT_IS_LOOP(stmt)) {
inLoop = true;
break;
}
}
if (!tc->sc->inFunction) {
JSObject *scope = tc->sc->scopeChain();
while (scope) {
if (scope->isWith())
inWith = true;
scope = scope->enclosingScope();
}
}
}
FunctionBox *
Parser::newFunctionBox(JSObject *obj, ParseNode *fn, TreeContext *tc)
{
@ -207,43 +245,13 @@ Parser::newFunctionBox(JSObject *obj, ParseNode *fn, TreeContext *tc)
* scanning, parsing and code generation for the whole script or top-level
* function.
*/
FunctionBox *funbox = context->tempLifoAlloc().newPod<FunctionBox>();
FunctionBox *funbox = context->tempLifoAlloc().new_<FunctionBox>(traceListHead, obj, fn, tc);
if (!funbox) {
js_ReportOutOfMemory(context);
return NULL;
}
funbox->traceLink = traceListHead;
traceListHead = funbox;
funbox->emitLink = NULL;
funbox->object = obj;
funbox->isFunctionBox = true;
funbox->node = fn;
funbox->siblings = tc->sc->functionList;
tc->sc->functionList = funbox;
funbox->kids = NULL;
funbox->parent = tc->sc->funbox;
new (&funbox->bindings) Bindings(context);
funbox->queued = false;
funbox->inLoop = false;
for (StmtInfo *stmt = tc->sc->topStmt; stmt; stmt = stmt->down) {
if (STMT_IS_LOOP(stmt)) {
funbox->inLoop = true;
break;
}
}
funbox->level = tc->sc->staticLevel;
funbox->inWith = !!tc->innermostWith;
if (!tc->sc->inFunction) {
JSObject *scope = tc->sc->scopeChain();
while (scope) {
if (scope->isWith())
funbox->inWith = true;
scope = scope->enclosingScope();
}
}
funbox->inGenexpLambda = false;
new (&funbox->cxFlags) ContextFlags(context); // the cxFlags are set in LeaveFunction
traceListHead = tc->sc->functionList = funbox;
return funbox;
}