wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-23 23:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

1320408 - Part 19: Remove JSContext* parameter from ModuleObject::fixEnvironmentsAfterCompartmentMerge.

Browse source
This commit is contained in:
Gaming4JC 2019-06-08 23:52:23 -04:00 • committed by Roy Tam
commit 62eeeb76b5
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
js/src/builtin/ModuleObject.cpp
View file

@ -788,7 +788,7 @@ AssertModuleScopesMatch(ModuleObject* module)
} }
void void
ModuleObject::fixEnvironmentsAfterCompartmentMerge(JSContext* cx) ModuleObject::fixEnvironmentsAfterCompartmentMerge()
{ {
AssertModuleScopesMatch(this); AssertModuleScopesMatch(this);
initialEnvironment().fixEnclosingEnvironmentAfterCompartmentMerge(script()->global()); initialEnvironment().fixEnclosingEnvironmentAfterCompartmentMerge(script()->global());

2
js/src/builtin/ModuleObject.h
View file

@ -244,7 +244,7 @@ class ModuleObject : public NativeObject
#ifdef DEBUG #ifdef DEBUG
static bool IsFrozen(JSContext* cx, HandleModuleObject self); static bool IsFrozen(JSContext* cx, HandleModuleObject self);
#endif #endif
void fixEnvironmentsAfterCompartmentMerge(JSContext* cx); void fixEnvironmentsAfterCompartmentMerge();
JSScript* script() const; JSScript* script() const;
Scope* enclosingScope() const; Scope* enclosingScope() const;

2
js/src/vm/HelperThreads.cpp
View file

@ -1291,7 +1291,7 @@ GlobalHelperThreadState::finishModuleParseTask(JSContext* cx, void* token)
MOZ_ASSERT(script->module()); MOZ_ASSERT(script->module());
RootedModuleObject module(cx, script->module()); RootedModuleObject module(cx, script->module());
module->fixEnvironmentsAfterCompartmentMerge(cx); module->fixEnvironmentsAfterCompartmentMerge();
if (!ModuleObject::Freeze(cx, module)) if (!ModuleObject::Freeze(cx, module))
return nullptr; return nullptr;