Issue #1691 - Part 6c: Fix a few issues with the earlier commits. Need PNK_CALL_IMPORT and PNK_IMPORT_META in the node children list or it will abort. When porting ScriptFetchOptions support, I had 2 constructors, I picked the wrong one. Missed adding the preference javascript.options.dynamicImport to all.js.

(cherry picked from commit b95ccb711dc41b343d02ae69b3dc4747bbbe86fb)

dom/script/ScriptLoader.cpp

@@ -118,6 +118,35 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(ScriptLoadRequest)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFetchOptions)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
+
+ScriptLoadRequest::ScriptLoadRequest(ScriptKind aKind,
+                                     nsIURI* aURI,
+                                     ScriptFetchOptions* aFetchOptions,
+                                     const SRIMetadata& aIntegrity,
+                                     nsIURI* aReferrer)
+  : mKind(aKind),
+    mScriptMode(ScriptMode::eBlocking),
+    mProgress(Progress::Loading),
+    mIsInline(true),
+    mHasSourceMapURL(false),
+    mInDeferList(false),
+    mInAsyncList(false),
+    mIsNonAsyncScriptInserted(false),
+    mIsXSLT(false),
+    mIsCanceled(false),
+    mWasCompiledOMT(false),
+    mOffThreadToken(nullptr),
+    mScriptTextBuf(nullptr),
+    mScriptTextLength(0),
+    mURI(aURI),
+    mLineNo(1),
+    mIntegrity(aIntegrity),
+    mReferrer(aReferrer),
+    mFetchOptions(aFetchOptions)
+{
+  MOZ_ASSERT(mFetchOptions);
+}
+
 ScriptLoadRequest::~ScriptLoadRequest()
 {
   js_free(mScriptTextBuf);

dom/script/ScriptLoader.h

@@ -91,27 +91,7 @@ public:
                     nsIURI* aURI,
                     ScriptFetchOptions* aFetchOptions,
                     const SRIMetadata& aIntegrity,
-                    nsIURI* aReferrer)
-    : mKind(aKind),
-      mScriptMode(ScriptMode::eBlocking),
-      mProgress(Progress::Loading),
-      mIsInline(true),
-      mHasSourceMapURL(false),
-      mInDeferList(false),
-      mInAsyncList(false),
-      mIsNonAsyncScriptInserted(false),
-      mIsXSLT(false),
-      mIsCanceled(false),
-      mWasCompiledOMT(false),
-      mOffThreadToken(nullptr),
-      mScriptTextBuf(nullptr),
-      mScriptTextLength(0),
-      mURI(aURI),
-      mLineNo(1),
-      mIntegrity(aIntegrity),
-      mReferrer(aReferrer)
-  {
-  }
+                    nsIURI* aReferrer);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(ScriptLoadRequest)

js/src/frontend/ParseNode.cpp

@@ -493,6 +493,8 @@ PushNodeChildren(ParseNode* pn, NodeStack* stack)
       case PNK_EXPORT_SPEC_LIST:
       case PNK_PARAMSBODY:
       case PNK_CLASSMETHODLIST:
+      case PNK_IMPORT_META:
+      case PNK_CALL_IMPORT:
         return PushListNodeChildren(&pn->as<ListNode>(), stack);
 
       // Array comprehension nodes are lists with a single child:

modules/libpref/init/all.js

@@ -1325,6 +1325,8 @@ pref("javascript.options.main_thread_stack_quota_cap", 6291456);
 pref("javascript.options.main_thread_stack_quota_cap", 2097152);
 #endif
 
+// Dynamic module import.
+pref("javascript.options.dynamicImport", false);
 
 // advanced prefs
 pref("advanced.mailftp",                    false);