diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-08 23:52:23 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:27 -0400 |
| commit | 31c0c2f9cc71f8ff1d8c183d38449693ec7ca502 (patch) | |
| tree | 780d3f455431926b848e64794a76988fb0f00a90 | |
| parent | 761b3afca59ba1c24337ff3afe0c91d005f7718b (diff) | |
| download | UXP-31c0c2f9cc71f8ff1d8c183d38449693ec7ca502.tar UXP-31c0c2f9cc71f8ff1d8c183d38449693ec7ca502.tar.gz UXP-31c0c2f9cc71f8ff1d8c183d38449693ec7ca502.tar.lz UXP-31c0c2f9cc71f8ff1d8c183d38449693ec7ca502.tar.xz UXP-31c0c2f9cc71f8ff1d8c183d38449693ec7ca502.zip | |
1320408 - Part 19: Remove JSContext* parameter from ModuleObject::fixEnvironmentsAfterCompartmentMerge.
| -rw-r--r-- | js/src/builtin/ModuleObject.cpp | 2 | ||||
| -rw-r--r-- | js/src/builtin/ModuleObject.h | 2 | ||||
| -rw-r--r-- | js/src/vm/HelperThreads.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp index 3888ad4d3..798ef46e1 100644 --- a/js/src/builtin/ModuleObject.cpp +++ b/js/src/builtin/ModuleObject.cpp @@ -788,7 +788,7 @@ AssertModuleScopesMatch(ModuleObject* module) } void -ModuleObject::fixEnvironmentsAfterCompartmentMerge(JSContext* cx) +ModuleObject::fixEnvironmentsAfterCompartmentMerge() { AssertModuleScopesMatch(this); initialEnvironment().fixEnclosingEnvironmentAfterCompartmentMerge(script()->global()); diff --git a/js/src/builtin/ModuleObject.h b/js/src/builtin/ModuleObject.h index d0ed8ed08..e83520ebe 100644 --- a/js/src/builtin/ModuleObject.h +++ b/js/src/builtin/ModuleObject.h @@ -244,7 +244,7 @@ class ModuleObject : public NativeObject #ifdef DEBUG static bool IsFrozen(JSContext* cx, HandleModuleObject self); #endif - void fixEnvironmentsAfterCompartmentMerge(JSContext* cx); + void fixEnvironmentsAfterCompartmentMerge(); JSScript* script() const; Scope* enclosingScope() const; diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp index bd29d0c79..44915521f 100644 --- a/js/src/vm/HelperThreads.cpp +++ b/js/src/vm/HelperThreads.cpp @@ -1291,7 +1291,7 @@ GlobalHelperThreadState::finishModuleParseTask(JSContext* cx, void* token) MOZ_ASSERT(script->module()); RootedModuleObject module(cx, script->module()); - module->fixEnvironmentsAfterCompartmentMerge(cx); + module->fixEnvironmentsAfterCompartmentMerge(); if (!ModuleObject::Freeze(cx, module)) return nullptr; |