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 1237508 - Odin: move GC allocation up to fix spurious hazard warning (there was an AutoKeepAtoms already) (r=hazard-red)

Browse Source
This commit is contained in:
Luke Wagner 2016-01-08 15:03:02 -06:00
parent e1235413e9
commit 493ed91559
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/asmjs/AsmJS.cpp
View File

@ -8116,6 +8116,10 @@ AsmJSModule::serialize(uint8_t* cursor) const
AsmJSModule::deserialize(ExclusiveContext* cx, const uint8_t* cursor, AsmJSParser& parser, AsmJSModule::deserialize(ExclusiveContext* cx, const uint8_t* cursor, AsmJSParser& parser,
MutableHandle<WasmModuleObject*> moduleObj) MutableHandle<WasmModuleObject*> moduleObj)
{ {
moduleObj.set(WasmModuleObject::create(cx));
if (!moduleObj)
return nullptr;
// Deserialization GC-allocates a bunch of atoms and stores them in unrooted // Deserialization GC-allocates a bunch of atoms and stores them in unrooted
// Vectors so, for simplicity, inhibit GC of the atoms zone. // Vectors so, for simplicity, inhibit GC of the atoms zone.
AutoKeepAtoms aka(cx->perThreadData); AutoKeepAtoms aka(cx->perThreadData);
@ -8150,10 +8154,6 @@ AsmJSModule::deserialize(ExclusiveContext* cx, const uint8_t* cursor, AsmJSParse
module->strict = parser.pc->sc->strict() && !parser.pc->sc->hasExplicitUseStrict(); module->strict = parser.pc->sc->strict() && !parser.pc->sc->hasExplicitUseStrict();
module->scriptSource.reset(parser.ss); module->scriptSource.reset(parser.ss);
moduleObj.set(WasmModuleObject::create(cx));
if (!moduleObj)
return nullptr;
if (!moduleObj->init(cx->new_<AsmJSModule>(Move(base), Move(link), Move(module)))) if (!moduleObj->init(cx->new_<AsmJSModule>(Move(base), Move(link), Move(module))))
return nullptr; return nullptr;
@ -8163,6 +8163,10 @@ AsmJSModule::deserialize(ExclusiveContext* cx, const uint8_t* cursor, AsmJSParse
bool bool
AsmJSModule::clone(JSContext* cx, MutableHandle<WasmModuleObject*> moduleObj) const AsmJSModule::clone(JSContext* cx, MutableHandle<WasmModuleObject*> moduleObj) const
{ {
moduleObj.set(WasmModuleObject::create(cx));
if (!moduleObj)
return false;
// Prevent any GC that may move the temporarily-unrooted atoms being cloned. // Prevent any GC that may move the temporarily-unrooted atoms being cloned.
AutoKeepAtoms aka(cx->perThreadData); AutoKeepAtoms aka(cx->perThreadData);
@ -8178,10 +8182,6 @@ AsmJSModule::clone(JSContext* cx, MutableHandle<WasmModuleObject*> moduleObj) co
if (!module || !module_->clone(cx, module.get())) if (!module || !module_->clone(cx, module.get()))
return false; return false;
moduleObj.set(WasmModuleObject::create(cx));
if (!moduleObj)
return false;
if (!moduleObj->init(cx->new_<AsmJSModule>(Move(base), Move(link), Move(module)))) if (!moduleObj->init(cx->new_<AsmJSModule>(Move(base), Move(link), Move(module))))
return false; return false;