Bug 834701 - Remove the XBL bit from spidermonkey. r=luke

This commit is contained in:
Bobby Holley 2013-05-20 22:34:18 -06:00
parent 62b6770441
commit e70b829860
7 changed files with 2 additions and 27 deletions

View File

@ -4356,8 +4356,7 @@ EmitFunc(JSContext *cx, BytecodeEmitter *bce, ParseNode *pn)
.setCompileAndGo(parent->compileAndGo)
.setSelfHostingMode(parent->selfHosted)
.setNoScriptRval(false)
.setVersion(parent->getVersion())
.setUserBit(parent->userBit);
.setVersion(parent->getVersion());
bool generateBytecode = true;
#ifdef JS_ION

View File

@ -5262,7 +5262,6 @@ JS::CompileOptions::CompileOptions(JSContext *cx)
forEval(false),
noScriptRval(cx->hasOption(JSOPTION_NO_SCRIPT_RVAL)),
selfHostingMode(false),
userBit(false),
sourcePolicy(SAVE_SOURCE)
{
}

View File

@ -3887,7 +3887,6 @@ struct JS_PUBLIC_API(CompileOptions) {
bool forEval;
bool noScriptRval;
bool selfHostingMode;
bool userBit;
enum SourcePolicy {
NO_SOURCE,
LAZY_SOURCE,
@ -3906,7 +3905,6 @@ struct JS_PUBLIC_API(CompileOptions) {
CompileOptions &setForEval(bool eval) { forEval = eval; return *this; }
CompileOptions &setNoScriptRval(bool nsr) { noScriptRval = nsr; return *this; }
CompileOptions &setSelfHostingMode(bool shm) { selfHostingMode = shm; return *this; }
CompileOptions &setUserBit(bool bit) { userBit = bit; return *this; }
CompileOptions &setSourcePolicy(SourcePolicy sp) { sourcePolicy = sp; return *this; }
};

View File

@ -599,18 +599,6 @@ JS_GetScriptVersion(JSContext *cx, JSScript *script)
return VersionNumber(script->getVersion());
}
JS_PUBLIC_API(bool)
JS_GetScriptUserBit(JSScript *script)
{
return script->userBit;
}
JS_PUBLIC_API(void)
JS_SetScriptUserBit(JSScript *script, bool b)
{
script->userBit = b;
}
JS_PUBLIC_API(bool)
JS_GetScriptIsSelfHosted(JSScript *script)
{

View File

@ -224,12 +224,6 @@ JS_GetScriptLineExtent(JSContext *cx, JSScript *script);
extern JS_PUBLIC_API(JSVersion)
JS_GetScriptVersion(JSContext *cx, JSScript *script);
extern JS_PUBLIC_API(bool)
JS_GetScriptUserBit(JSScript *script);
extern JS_PUBLIC_API(void)
JS_SetScriptUserBit(JSScript *script, bool b);
extern JS_PUBLIC_API(bool)
JS_GetScriptIsSelfHosted(JSScript *script);

View File

@ -1677,7 +1677,6 @@ JSScript::Create(JSContext *cx, HandleObject enclosingScope, bool savedCallerFun
script->setScriptSource(ss);
script->sourceStart = bufStart;
script->sourceEnd = bufEnd;
script->userBit = options.userBit;
return script;
}
@ -2308,8 +2307,7 @@ js::CloneScript(JSContext *cx, HandleObject enclosingScope, HandleFunction fun,
.setCompileAndGo(src->compileAndGo)
.setSelfHostingMode(src->selfHosted)
.setNoScriptRval(src->noScriptRval)
.setVersion(src->getVersion())
.setUserBit(src->userBit);
.setVersion(src->getVersion());
RootedScript dst(cx, JSScript::Create(cx, enclosingScope, src->savedCallerFun,
options, src->staticLevel,
src->scriptSource(), src->sourceStart, src->sourceEnd));

View File

@ -441,7 +441,6 @@ class JSScript : public js::gc::Cell
JSCompartment::debugScriptMap */
bool hasFreezeConstraints:1; /* freeze constraints for stack
* type sets have been generated */
bool userBit:1; /* Opaque, used by the embedding. */
private:
/* See comments below. */