wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1144802 part 8. Drop the scopechain member from GlobalSharedContext, since it's not needed anymore. r=luke

Browse Source
This commit is contained in:
Boris Zbarsky 2015-03-20 00:34:08 -04:00
parent 3262699e31
commit 9019492a10
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,7 +283,7 @@ frontend::CompileScript(ExclusiveContext *cx, LifoAlloc *alloc, HandleObject sco
return nullptr;
Directives directives(options.strictOption);
GlobalSharedContext globalsc(cx, scopeChain, directives, options.extraWarningsOption);
GlobalSharedContext globalsc(cx, directives, options.extraWarningsOption);
bool savedCallerFun = evalCaller && evalCaller->functionOrCallerFunction();
Rooted<JSScript*> script(cx, JSScript::Create(cx, evalStaticScope, savedCallerFun,

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

@ -699,7 +699,7 @@ Parser<ParseHandler>::parse(JSObject *chain)
* protected from the GC by a root or a stack frame reference.
*/
Directives directives(options().strictOption);
GlobalSharedContext globalsc(context, chain, directives, options().extraWarningsOption);
GlobalSharedContext globalsc(context, directives, options().extraWarningsOption);
ParseContext<ParseHandler> globalpc(this, /* parent = */ nullptr, ParseHandler::null(),
&globalsc, /* newDirectives = */ nullptr,
/* staticLevel = */ 0, /* bodyid = */ 0,

18
js/src/frontend/SharedContext.h
View File

@ -193,9 +193,7 @@ class SharedContext
{}
virtual ObjectBox *toObjectBox() = 0;
inline bool isGlobalSharedContext() { return toObjectBox() == nullptr; }
inline bool isFunctionBox() { return toObjectBox() && toObjectBox()->isFunctionBox(); }
inline GlobalSharedContext *asGlobalSharedContext();
inline FunctionBox *asFunctionBox();
bool hasExplicitUseStrict() const { return anyCxFlags.hasExplicitUseStrict; }
@ -231,27 +229,15 @@ class SharedContext
class GlobalSharedContext : public SharedContext
{
private:
const RootedObject scopeChain_; /* scope chain object for the script */
public:
GlobalSharedContext(ExclusiveContext *cx, JSObject *scopeChain,
GlobalSharedContext(ExclusiveContext *cx,
Directives directives, bool extraWarnings)
: SharedContext(cx, directives, extraWarnings),
scopeChain_(cx, scopeChain)
: SharedContext(cx, directives, extraWarnings)
{}
ObjectBox *toObjectBox() { return nullptr; }
JSObject *scopeChain() const { return scopeChain_; }
};
inline GlobalSharedContext *
SharedContext::asGlobalSharedContext()
{
MOZ_ASSERT(isGlobalSharedContext());
return static_cast<GlobalSharedContext*>(this);
}
class FunctionBox : public ObjectBox, public SharedContext
{
public: