/js/src/frontend/Stencil.cpp and 2 more files have been updated (96db70a9)

[github-actions[bot]]

Files

• /js/src/frontend/Stencil.cpp
• /js/src/frontend/Stencil.h
• /js/src/vm/SharedStencil.h

Changesets

• https://hg.mozilla.org/mozilla-central/rev/96db70a9e961689acbaf7c51093d9f7ab8284a9d Bug 1795524 - Part 2: Move ModuleObject slots for cyclic module record fields to CyclicModuleFields r=arai
• https://hg.mozilla.org/mozilla-central/rev/e73aa97850d98767d5daad54c251b4013851c4c4 Bug 1795524 - Part 1: Move definition of FunctionDeclarationVector to SharedStencil.h to avoid dependency cycle r=arai

Diffs

/js/src/frontend/Stencil.cpp

--- 86a890c4b6fa9c4fbeb59fcc5a1d07ec4908a370/js/src/frontend/Stencil.cpp
+++ 96db70a9e961689acbaf7c51093d9f7ab8284a9d/js/src/frontend/Stencil.cpp
@@ -2153,17 +2153,16 @@ static bool InstantiateTopLevel(JSContex
   // Finish initializing the ModuleObject if needed.
   if (scriptExtra.isModule()) {
     RootedScript script(cx, gcOutput.script);
     Rooted<ModuleObject*> module(cx, gcOutput.module);

     script->outermostScope()->as<ModuleScope>().initModule(module);

     module->initScriptSlots(script);
-    module->initStatusSlot();

     if (!ModuleObject::createEnvironment(cx, module)) {
       return false;
     }

     MOZ_ASSERT(!cx->isHelperThreadContext());
     if (!ModuleObject::Freeze(cx, module)) {
       return false;

/js/src/frontend/Stencil.h

--- 498d812eb398285bb093ade3c2534e1400e3c7ee/js/src/frontend/Stencil.h
+++ e73aa97850d98767d5daad54c251b4013851c4c4/js/src/frontend/Stencil.h
@@ -436,21 +436,16 @@ class ScopeStencil {
       case ScopeKind::WasmInstance: {
         return false;
       }
     }
     return false;
   }
 };

-// See JSOp::Lambda for interepretation of this index.
-using FunctionDeclaration = GCThingIndex;
-using FunctionDeclarationVector =
-    Vector<FunctionDeclaration, 0, js::SystemAllocPolicy>;
-
 class StencilModuleAssertion {
  public:
   TaggedParserAtomIndex key;
   TaggedParserAtomIndex value;

   StencilModuleAssertion() = default;
   StencilModuleAssertion(TaggedParserAtomIndex key, TaggedParserAtomIndex value)
       : key(key), value(value) {}

/js/src/vm/SharedStencil.h

--- 8206e79b9126c9c0ef6de804fd016aaa7a6adf51/js/src/vm/SharedStencil.h
+++ e73aa97850d98767d5daad54c251b4013851c4c4/js/src/vm/SharedStencil.h
@@ -20,16 +20,17 @@
 #include <stdint.h>  // uint8_t, uint16_t, uint32_t

 #include "frontend/SourceNotes.h"  // js::SrcNote
 #include "frontend/TypedIndex.h"   // js::frontend::TypedIndex

 #include "js/AllocPolicy.h"            // js::SystemAllocPolicy
 #include "js/TypeDecls.h"              // JSContext,jsbytecode
 #include "js/UniquePtr.h"              // js::UniquePtr
+#include "js/Vector.h"                 // js::Vector
 #include "util/EnumFlags.h"            // js::EnumFlags
 #include "util/TrailingArray.h"        // js::TrailingArray
 #include "vm/GeneratorAndAsyncKind.h"  // GeneratorKind, FunctionAsyncKind
 #include "vm/StencilEnums.h"  // js::{TryNoteKind,ImmutableScriptFlagsEnum,MutableScriptFlagsEnum}

 //
 // Data structures shared between Stencil and the VM.
 //
@@ -790,11 +791,17 @@ struct MemberInitializers {
 #ifdef DEBUG
         valid(false),
 #endif
         hasPrivateBrand(false),
         numMemberInitializers(0) {
   }
 };

+// See JSOp::Lambda for interepretation of this index.
+using FunctionDeclaration = GCThingIndex;
+// Defined here to avoid #include cycle with Stencil.h.
+using FunctionDeclarationVector =
+    Vector<FunctionDeclaration, 0, js::SystemAllocPolicy>;
+
 }  // namespace js

 #endif /* vm_SharedStencil_h */