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

Bug 758509 (part 8) - Initialize JSScript::globalObject in Create(). r=luke.

Browse Source
This commit is contained in:
Nicholas Nethercote
2012-06-06 21:37:37 -07:00
parent ca4669a5e6
commit 8eb21bf6c3
6 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,13 +113,14 @@ frontend::CompileScript(JSContext *cx, JSObject *scopeChain, StackFrame *callerF
return NULL;
bool savedCallerFun = compileAndGo && callerFrame && callerFrame->isFunctionFrame();
GlobalObject *globalObject = needScriptGlobal ? GetCurrentGlobal(cx) : NULL;
Rooted<JSScript*> script(cx);
script = JSScript::Create(cx, savedCallerFun, principals, originPrincipals, compileAndGo,
noScriptRval, version, staticLevel);
noScriptRval, globalObject, version, staticLevel);
if (!script)
return NULL;
BytecodeEmitter bce(&parser, &sc, script, lineno, needScriptGlobal);
BytecodeEmitter bce(&parser, &sc, script, lineno);
if (!bce.init())
return NULL;
@@ -271,14 +272,15 @@ frontend::CompileFunctionBody(JSContext *cx, JSFunction *fun,
if (!funtc.init())
return false;
GlobalObject *globalObject = fun->getParent() ? &fun->getParent()->global() : NULL;
Rooted<JSScript*> script(cx);
script = JSScript::Create(cx, /* savedCallerFun = */ false, principals, originPrincipals,
/* compileAndGo = */ false, /* noScriptRval = */ false,
version, staticLevel);
globalObject, version, staticLevel);
if (!script)
return false;
BytecodeEmitter funbce(&parser, &funsc, script, lineno, /* needsScriptGlobal = */ false);
BytecodeEmitter funbce(&parser, &funsc, script, lineno);
if (!funbce.init())
return false;