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 1183191 followup - Fix AutoDelazify to not enter the self-hosting compartment, it can race. r=shu CLOSED TREE

Browse Source
This commit is contained in:
Jan de Mooij 2015-07-13 22:52:34 +02:00
parent 25e9018bb1
commit cea5e2e24a
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsfun.cpp
View File

@ -2182,11 +2182,6 @@ js::CloneFunctionAndScript(JSContext* cx, HandleFunction fun, HandleObject paren
#endif #endif
if (clone->isInterpreted()) { if (clone->isInterpreted()) {
// The self-hosting compartment is shared across processes, and
// AutoDelazify enters fun->compartment(). We would get races if the
// self-hosting compartment has lazy interpreted functions.
MOZ_ASSERT_IF(fun->compartment()->isSelfHosting, !fun->isInterpretedLazy());
RootedScript script(cx, fun->nonLazyScript()); RootedScript script(cx, fun->nonLazyScript());
MOZ_ASSERT(script->compartment() == fun->compartment()); MOZ_ASSERT(script->compartment() == fun->compartment());
MOZ_ASSERT(cx->compartment() == clone->compartment(), MOZ_ASSERT(cx->compartment() == clone->compartment(),

29
js/src/jsscript.cpp
View File

@ -4138,11 +4138,30 @@ void
JSScript::AutoDelazify::holdScript(JS::HandleFunction fun) JSScript::AutoDelazify::holdScript(JS::HandleFunction fun)
{ {
if (fun) { if (fun) {
JSAutoCompartment ac(cx_, fun); if (fun->compartment()->isSelfHosting) {
script_ = fun->getOrCreateScript(cx_); // The self-hosting compartment is shared across runtimes, so we
if (script_) { // can't use JSAutoCompartment: it could cause races. Functions in
oldDoNotRelazify_ = script_->doNotRelazify_; // the self-hosting compartment will never be lazy, so we can safely
script_->setDoNotRelazify(true); // assume we don't have to delazify.
script_ = fun->nonLazyScript();
} else {
JSAutoCompartment ac(cx_, fun);
script_ = fun->getOrCreateScript(cx_);
if (script_) {
oldDoNotRelazify_ = script_->doNotRelazify_;
script_->setDoNotRelazify(true);
}
} }
} }
} }
void
JSScript::AutoDelazify::dropScript()
{
// Don't touch script_ if it's in the self-hosting compartment, see the
// comment in holdScript.
if (script_ && !script_->compartment()->isSelfHosting) {
script_->setDoNotRelazify(oldDoNotRelazify_);
script_ = nullptr;
}
}

9
js/src/jsscript.h
View File

@ -1764,14 +1764,7 @@ class JSScript : public js::gc::TenuredCell
private: private:
void holdScript(JS::HandleFunction fun); void holdScript(JS::HandleFunction fun);
void dropScript();
void dropScript()
{
if (script_) {
script_->setDoNotRelazify(oldDoNotRelazify_);
script_ = nullptr;
}
}
}; };
}; };