corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 764714 (part 2) - Move Parser::callerFrame to BytecodeEmitter. r=jorendorff.

Browse Source
This commit is contained in:
Nicholas Nethercote
2012-06-13 23:28:04 -07:00
parent 484b9d971b
commit a0c6e9867e
11 changed files with 41 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/frontend/BytecodeCompiler.cpp
View File

@@ -95,7 +95,7 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
JS_ASSERT_IF(staticLevel != 0, callerFrame);
Parser parser(cx, principals, originPrincipals, chars, length, filename, lineno, version,
callerFrame, /* foldConstants = */ true, compileAndGo);
/* foldConstants = */ true, compileAndGo);
if (!parser.init())
return NULL;
@@ -113,7 +113,7 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
if (!script)
return NULL;
BytecodeEmitter bce(&parser, &sc, script, lineno);
BytecodeEmitter bce(&parser, &sc, script, callerFrame, lineno);
if (!bce.init())
return NULL;
@@ -192,10 +192,10 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
if (inDirectivePrologue && !parser.recognizeDirectivePrologue(pn, &inDirectivePrologue))
return NULL;
if (!FoldConstants(cx, pn, bce.parser))
if (!FoldConstants(cx, pn, &parser))
return NULL;
if (!AnalyzeFunctions(bce.parser))
if (!AnalyzeFunctions(&parser, callerFrame))
return NULL;
tc.functionList = NULL;
@@ -206,7 +206,7 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
if (!pn->isKind(PNK_SEMI) || !pn->pn_kid || !pn->pn_kid->isXMLItem())
onlyXML = false;
#endif
bce.parser->freeTree(pn);
parser.freeTree(pn);
}
#if JS_HAS_XML_SUPPORT
@@ -222,8 +222,18 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
}
#endif
if (!parser.checkForArgumentsAndRest())
return NULL;
// It's an error to use |arguments| in a function that has a rest parameter.
if (callerFrame && callerFrame->isFunctionFrame() && callerFrame->fun()->hasRest()) {
PropertyName *arguments = cx->runtime->atomState.argumentsAtom;
for (AtomDefnRange r = tc.lexdeps->all(); !r.empty(); r.popFront()) {
if (r.front().key() == arguments) {
parser.reportErrorNumber(NULL, JSREPORT_ERROR, JSMSG_ARGUMENTS_AND_REST);
return NULL;
}
}
// We're not in a function context, so we don't expect any bindings.
JS_ASSERT(sc.bindings.lookup(cx, arguments, NULL) == NONE);
}
/*
* Nowadays the threaded interpreter needs a stop instruction, so we
@@ -250,8 +260,7 @@ frontend::CompileFunctionBody(JSContext *cx, JSFunction *fun,
const char *filename, unsigned lineno, JSVersion version)
{
Parser parser(cx, principals, originPrincipals, chars, length, filename, lineno, version,
/* callerFrame = */ NULL, /* foldConstants = */ true,
/* compileAndGo = */ false);
/* foldConstants = */ true, /* compileAndGo = */ false);
if (!parser.init())
return false;
@@ -271,7 +280,8 @@ frontend::CompileFunctionBody(JSContext *cx, JSFunction *fun,
if (!script)
return false;
BytecodeEmitter funbce(&parser, &funsc, script, lineno);
StackFrame *nullCallerFrame = NULL;
BytecodeEmitter funbce(&parser, &funsc, script, nullCallerFrame, lineno);
if (!funbce.init())
return false;
@@ -328,7 +338,7 @@ frontend::CompileFunctionBody(JSContext *cx, JSFunction *fun,
if (!FoldConstants(cx, pn, &parser))
return false;
if (!AnalyzeFunctions(&parser))
if (!AnalyzeFunctions(&parser, nullCallerFrame))
return false;
if (fn->pn_body) {