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

Bug 847934 - GC: Remove Unrooted - Remove use of DropUnrooted and rename UnrootedThings to RawThings r=terrence

Browse Source
This commit is contained in:
Jon Coppeard
2013-03-05 18:32:12 +00:00
parent 1d391d1c99
commit 498bd73a38
110 changed files with 716 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ CheckLength(JSContext *cx, size_t length)
}
static bool
SetSourceMap(JSContext *cx, TokenStream &tokenStream, ScriptSource *ss, UnrootedScript script)
SetSourceMap(JSContext *cx, TokenStream &tokenStream, ScriptSource *ss, RawScript script)
{
if (tokenStream.hasSourceMap()) {
if (!ss->setSourceMap(cx, tokenStream.releaseSourceMap(), script->filename))
@@ -68,7 +68,7 @@ CheckArgumentsWithinEval(JSContext *cx, Parser<FullParseHandler> &parser, Handle
return true;
}
UnrootedScript
RawScript
frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
HandleScript evalCaller,
const CompileOptions &options,
@@ -100,18 +100,18 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
JS_ASSERT_IF(staticLevel != 0, evalCaller);
if (!CheckLength(cx, length))
return UnrootedScript(NULL);
return NULL;
JS_ASSERT_IF(staticLevel != 0, options.sourcePolicy != CompileOptions::LAZY_SOURCE);
ScriptSource *ss = cx->new_<ScriptSource>();
if (!ss)
return UnrootedScript(NULL);
return NULL;
ScriptSourceHolder ssh(ss);
SourceCompressionToken mysct(cx);
SourceCompressionToken *sct = (extraSct) ? extraSct : &mysct;
switch (options.sourcePolicy) {
case CompileOptions::SAVE_SOURCE:
if (!ss->setSourceCopy(cx, chars, length, false, sct))
return UnrootedScript(NULL);
return NULL;
break;
case CompileOptions::LAZY_SOURCE:
ss->setSourceRetrievable();
@@ -122,14 +122,14 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
Parser<FullParseHandler> parser(cx, options, chars, length, /* foldConstants = */ true);
if (!parser.init())
return UnrootedScript(NULL);
return NULL;
parser.sct = sct;
GlobalSharedContext globalsc(cx, scopeChain, StrictModeFromContext(cx));
ParseContext<FullParseHandler> pc(&parser, &globalsc, staticLevel, /* bodyid = */ 0);
if (!pc.init())
return UnrootedScript(NULL);
return NULL;
bool savedCallerFun =
options.compileAndGo &&
@@ -138,13 +138,13 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
Rooted<JSScript*> script(cx, JSScript::Create(cx, NullPtr(), savedCallerFun,
options, staticLevel, ss, 0, length));
if (!script)
return UnrootedScript(NULL);
return NULL;
// Global/eval script bindings are always empty (all names are added to the
// scope dynamically via JSOP_DEFFUN/VAR).
InternalHandle<Bindings*> bindings(script, &script->bindings);
if (!Bindings::initWithTemporaryStorage(cx, bindings, 0, 0, NULL))
return UnrootedScript(NULL);
return NULL;
// We can specialize a bit for the given scope chain if that scope chain is the global object.
JSObject *globalScope = scopeChain && scopeChain == &scopeChain->global() ? (JSObject*) scopeChain : NULL;
@@ -154,7 +154,7 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
BytecodeEmitter bce(/* parent = */ NULL, &parser, &globalsc, script, evalCaller, !!globalScope,
options.lineno, options.selfHostingMode);
if (!bce.init())
return UnrootedScript(NULL);
return NULL;
/* If this is a direct call to eval, inherit the caller's strictness. */
if (evalCaller && evalCaller->strict)
@@ -169,7 +169,7 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
JSAtom *atom = AtomizeString<CanGC>(cx, source);
jsatomid _;
if (!atom || !bce.makeAtomIndex(atom, &_))
return UnrootedScript(NULL);
return NULL;
}
if (evalCaller && evalCaller->functionOrCallerFunction()) {
@@ -181,7 +181,7 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
JSFunction *fun = evalCaller->functionOrCallerFunction();
ObjectBox *funbox = parser.newFunctionBox(fun, &pc, fun->strict());
if (!funbox)
return UnrootedScript(NULL);
return NULL;
bce.objectList.add(funbox);
}
}
@@ -193,31 +193,31 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
if (tt == TOK_EOF)
break;
JS_ASSERT(tt == TOK_ERROR);
return UnrootedScript(NULL);
return NULL;
}
ParseNode *pn = parser.statement();
if (!pn)
return UnrootedScript(NULL);
return NULL;
if (canHaveDirectives) {
if (!parser.maybeParseDirective(pn, &canHaveDirectives))
return UnrootedScript(NULL);
return NULL;
}
if (!FoldConstants(cx, &pn, &parser))
return UnrootedScript(NULL);
return NULL;
if (!NameFunctions(cx, pn))
return UnrootedScript(NULL);
return NULL;
if (!EmitTree(cx, &bce, pn))
return UnrootedScript(NULL);
return NULL;
parser.handler.freeTree(pn);
}
if (!SetSourceMap(cx, parser.tokenStream, ss, script))
return UnrootedScript(NULL);
return NULL;
if (evalCaller && evalCaller->functionOrCallerFunction()) {
// Watch for uses of 'arguments' within the evaluated script, both as
@@ -227,13 +227,13 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
for (AtomDefnRange r = pc.lexdeps->all(); !r.empty(); r.popFront()) {
if (r.front().key() == arguments) {
if (!CheckArgumentsWithinEval(cx, parser, fun))
return UnrootedScript(NULL);
return NULL;
}
}
for (AtomDefnListMap::Range r = pc.decls().all(); !r.empty(); r.popFront()) {
if (r.front().key() == arguments) {
if (!CheckArgumentsWithinEval(cx, parser, fun))
return UnrootedScript(NULL);
return NULL;
}
}
@@ -247,7 +247,7 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
RootedScript script(cx, scope->asCall().callee().nonLazyScript());
if (script->argumentsHasVarBinding()) {
if (!JSScript::argumentsOptimizationFailed(cx, script))
return UnrootedScript(NULL);
return NULL;
}
}
scope = scope->enclosingScope();
@@ -260,15 +260,15 @@ frontend::CompileScript(JSContext *cx, HandleObject scopeChain,
* do have to emit that here.
*/
if (Emit1(cx, &bce, JSOP_STOP) < 0)
return UnrootedScript(NULL);
return NULL;
if (!JSScript::fullyInitFromEmitter(cx, script, &bce))
return UnrootedScript(NULL);
return NULL;
bce.tellDebuggerAboutCompiledScript(cx);
if (sct == &mysct && !sct->complete())
return UnrootedScript(NULL);
return NULL;
return script;
}