Bug 1687973 - Part 7: Remove ModuleObject::fixEnvironmentsAfterRealmMerge. r=tcampbell

Differential Revision: https://phabricator.services.mozilla.com/D131361

js/src/builtin/ModuleObject.cpp

@@ -407,9 +407,6 @@ void IndirectBindingMap::trace(JSTracer* trc) {
 bool IndirectBindingMap::put(JSContext* cx, HandleId name,
                              HandleModuleEnvironmentObject environment,
                              HandleId targetName) {
-  // This object might have been allocated on the background parsing thread in
-  // different zone to the final module. Lazily allocate the map so we don't
-  // have to switch its zone when merging realms.
   if (!map_) {
     MOZ_ASSERT(!cx->zone()->createdForHelperThread());
     map_.emplace(cx->zone());
@@ -1017,19 +1014,6 @@ static inline bool CheckObjectPropertyFrozen(JSContext* cx,
 
 #endif
 
-inline static void AssertModuleScopesMatch(ModuleObject* module) {
-  MOZ_ASSERT(module->enclosingScope()->is<GlobalScope>());
-  MOZ_ASSERT(IsGlobalLexicalEnvironment(
-      &module->initialEnvironment().enclosingEnvironment()));
-}
-
-void ModuleObject::fixEnvironmentsAfterRealmMerge() {
-  AssertModuleScopesMatch(this);
-  initialEnvironment().fixEnclosingEnvironmentAfterRealmMerge(
-      script()->global());
-  AssertModuleScopesMatch(this);
-}
-
 JSScript* ModuleObject::maybeScript() const {
   Value value = getReservedSlot(ScriptSlot);
   if (value.isUndefined()) {

js/src/builtin/ModuleObject.h

@@ -330,7 +330,6 @@ class ModuleObject : public NativeObject {
 #ifdef DEBUG
   static bool AssertFrozen(JSContext* cx, HandleModuleObject self);
 #endif
-  void fixEnvironmentsAfterRealmMerge();
 
   JSScript* maybeScript() const;
   JSScript* script() const;

js/src/vm/EnvironmentObject.cpp

@@ -464,11 +464,6 @@ bool ModuleEnvironmentObject::lookupImport(
   return importBindings().lookup(name, envOut, propOut);
 }
 
-void ModuleEnvironmentObject::fixEnclosingEnvironmentAfterRealmMerge(
-    GlobalObject& global) {
-  setEnclosingEnvironment(&global.lexicalEnvironment());
-}
-
 /* static */
 bool ModuleEnvironmentObject::lookupProperty(JSContext* cx, HandleObject obj,
                                              HandleId id,

js/src/vm/EnvironmentObject.h

@@ -447,8 +447,6 @@ class ModuleEnvironmentObject : public EnvironmentObject {
   bool lookupImport(jsid name, ModuleEnvironmentObject** envOut,
                     mozilla::Maybe<PropertyInfo>* propOut);
 
-  void fixEnclosingEnvironmentAfterRealmMerge(GlobalObject& global);
-
  private:
   static bool lookupProperty(JSContext* cx, HandleObject obj, HandleId id,
                              MutableHandleObject objp, PropertyResult* propp);