[dart2wasm] Replace "dynamic module" with "submodule" where appropriate.

Change-Id: I4e51e10928ccc26c18f2a63f6cb6b23cd618d853
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426003
Commit-Queue: Mayank Patke <[email protected]>
Reviewed-by: Ömer Ağacan <[email protected]>
Reviewed-by: Nate Biggs <[email protected]>

Author: fishythefish

pkg/dart2wasm/lib/class_info.dart

@@ -374,13 +374,13 @@ class ClassInfoCollector {
       info = ClassInfo(cls, classId, superInfo.depth + 1, struct, superInfo,
           typeParameterMatch: typeParameterMatch);
       if (translator.dynamicModuleSupportEnabled &&
-          cls.isDynamicModuleExtendable(translator.coreTypes)) {
-        // If a class is extendable in a dynamic module then we have to be
+          cls.isDynamicSubmoduleExtendable(translator.coreTypes)) {
+        // If a class is extendable in a submodule then we have to be
         // conservative and mark it as not being final.
         struct.hasAnySubtypes = true;
       }
 
-      if (translator.isDynamicModule) {
+      if (translator.isDynamicSubmodule) {
         final brandIndex = translator
             .dynamicModuleInfo!.metadata.classMetadata[cls]?.brandIndex;
         if (brandIndex != null) {
@@ -504,7 +504,7 @@ class ClassInfoCollector {
     // Class infos by class-id, will be populated by the calls to
     // [_createStructForClass] and [_createStructForRecordClass] below.
     translator.classes = List<ClassInfo>.filled(
-        (classIdNumbering.maxDynamicModuleClassId ??
+        (classIdNumbering.maxDynamicSubmoduleClassId ??
                 classIdNumbering.maxClassId) +
             1,
         topInfo);
@@ -540,10 +540,10 @@ class ClassInfoCollector {
     for (final cls in dfsOrder) {
       ClassInfo? representation;
       if (translator.dynamicModuleSupportEnabled &&
-          cls.isDynamicModuleExtendable(translator.coreTypes)) {
+          cls.isDynamicSubmoduleExtendable(translator.coreTypes)) {
         assert(!translator.builtinTypes.containsKey(cls));
 
-        // If a class is extendable in a dynamic module then we have to be
+        // If a class is extendable in a dynamic submodule then we have to be
         // conservative and assume it might be a subclass of Object. The Object
         // class maps to topInfo because boxed values are a subtype of Object in
         // Dart but not of the object struct.
@@ -567,16 +567,16 @@ class ClassInfoCollector {
         final mainModuleConcreteRange =
             classIdNumbering.getConcreteClassIdRangeForMainModule(cls);
         // Only non-extendable classes can get here so they should only have
-        // concrete implementations in either the main module or the dynamic
-        // module, not both.
-        if (translator.isDynamicModule && mainModuleConcreteRange.isEmpty) {
-          final dynamicModuleConcreteRange =
-              classIdNumbering.getConcreteClassIdRangeForDynamicModule(cls);
-          assert(dynamicModuleConcreteRange.isNotEmpty);
-          addRanges(dynamicModuleConcreteRange);
+        // concrete implementations in either the main module or the submodule,
+        // not both.
+        if (translator.isDynamicSubmodule && mainModuleConcreteRange.isEmpty) {
+          final submoduleConcreteRange =
+              classIdNumbering.getConcreteClassIdRangeForDynamicSubmodule(cls);
+          assert(submoduleConcreteRange.isNotEmpty);
+          addRanges(submoduleConcreteRange);
         } else {
           assert(classIdNumbering
-              .getConcreteClassIdRangeForDynamicModule(cls)
+              .getConcreteClassIdRangeForDynamicSubmodule(cls)
               .isEmpty);
           addRanges(mainModuleConcreteRange);
         }
@@ -608,31 +608,31 @@ class ClassIdNumbering {
   final Map<Class, List<Class>> _subclasses;
   final Map<Class, List<Class>> _implementors;
   final Map<Class, List<Range>> _concreteSubclassIdRange;
-  final Map<Class, List<Range>> _concreteSubclassIdRangeForDynamicModule;
+  final Map<Class, List<Range>> _concreteSubclassIdRangeForDynamicSubmodule;
   final Set<Class> _masqueraded;
 
   final List<Class> dfsOrder;
   final Map<Class, ClassId> classIds;
   final int maxConcreteClassId;
   final int maxClassId;
-  final int? maxDynamicModuleConcreteClassId;
-  final int? maxDynamicModuleClassId;
+  final int? maxDynamicSubmoduleConcreteClassId;
+  final int? maxDynamicSubmoduleClassId;
 
-  int get firstDynamicModuleClassId => maxClassId + 1;
+  int get firstDynamicSubmoduleClassId => maxClassId + 1;
 
   ClassIdNumbering._(
       this.translator,
       this._subclasses,
       this._implementors,
       this._concreteSubclassIdRange,
-      this._concreteSubclassIdRangeForDynamicModule,
+      this._concreteSubclassIdRangeForDynamicSubmodule,
       this._masqueraded,
       this.dfsOrder,
       this.classIds,
       this.maxConcreteClassId,
       this.maxClassId,
-      this.maxDynamicModuleConcreteClassId,
-      this.maxDynamicModuleClassId);
+      this.maxDynamicSubmoduleConcreteClassId,
+      this.maxDynamicSubmoduleClassId);
 
   final Map<Class, Set<Class>> _transitiveImplementors = {};
   Set<Class> _getTransitiveImplementors(Class klass) {
@@ -670,17 +670,17 @@ class ClassIdNumbering {
         klass, _concreteClassIdRanges, _concreteSubclassIdRange);
   }
 
-  final Map<Class, List<Range>> _concreteClassIdRangesForDynamicModule = {};
-  List<Range> getConcreteClassIdRangeForDynamicModule(Class klass) {
+  final Map<Class, List<Range>> _concreteClassIdRangesForDynamicSubmodule = {};
+  List<Range> getConcreteClassIdRangeForDynamicSubmodule(Class klass) {
     return _getConcreteClassIdRange(
         klass,
-        _concreteClassIdRangesForDynamicModule,
-        _concreteSubclassIdRangeForDynamicModule);
+        _concreteClassIdRangesForDynamicSubmodule,
+        _concreteSubclassIdRangeForDynamicSubmodule);
   }
 
   List<Range> getConcreteClassIdRangeForCurrentModule(Class klass) {
-    return translator.isDynamicModule
-        ? getConcreteClassIdRangeForDynamicModule(klass)
+    return translator.isDynamicSubmodule
+        ? getConcreteClassIdRangeForDynamicSubmodule(klass)
         : getConcreteClassIdRangeForMainModule(klass);
   }
 
@@ -727,7 +727,7 @@ class ClassIdNumbering {
     final implementors = <Class, List<Class>>{};
     final classIds = <Class, ClassId>{};
 
-    if (translator.isDynamicModule) {
+    if (translator.isDynamicSubmodule) {
       final savedMapping = translator.dynamicModuleInfo!.metadata.classMetadata;
       savedMapping.forEach((cls, metadata) {
         final classId = metadata.classId;
@@ -832,7 +832,7 @@ class ClassIdNumbering {
     // Maps any class to a dense range of concrete class ids that are subclasses
     // of that class.
     final concreteSubclassRanges = <Class, List<Range>>{};
-    final concreteSubclassRangesForDynamicModule = <Class, List<Range>>{};
+    final concreteSubclassRangesForDynamicSubmodule = <Class, List<Range>>{};
 
     int nextConcreteClassId = (savedMaxClassId ?? (firstClassId - 1)) + 1;
     int nextAbstractClassId = nextConcreteClassId + concreteClassCount;
@@ -867,7 +867,7 @@ class ClassIdNumbering {
     }
 
     final subclassesRangesToBuild = savedMaxClassId != null
-        ? concreteSubclassRangesForDynamicModule
+        ? concreteSubclassRangesForDynamicSubmodule
         : concreteSubclassRanges;
 
     dfs(root, (Class cls) {
@@ -911,7 +911,7 @@ class ClassIdNumbering {
         subclasses,
         implementors,
         concreteSubclassRanges,
-        concreteSubclassRangesForDynamicModule,
+        concreteSubclassRangesForDynamicSubmodule,
         masqueraded,
         dfsOrder,
         classIds,

pkg/dart2wasm/lib/closures.dart

@@ -203,11 +203,11 @@ class ClosureLayouter extends RecursiveVisitor {
   late final List<List<ClosureRepresentationsForParameterCount>>
       representations;
 
-  // Dynamic modules invoke closures dynamically so they use the base structs
+  // Dynamic submodules invoke closures dynamically so they use the base structs
   // in all cases. Therefore, We only need one global copy of the
   // ClosureRepresentation for generic and one for non-generic functions.
-  ClosureRepresentation? _dynamicModuleRepresentation;
-  ClosureRepresentation? _dynamicModuleGenericRepresentation;
+  ClosureRepresentation? _dynamicSubmoduleRepresentation;
+  ClosureRepresentation? _dynamicSubmoduleGenericRepresentation;
 
   Set<Constant> visitedConstants = Set.identity();
 
@@ -327,7 +327,7 @@ class ClosureLayouter extends RecursiveVisitor {
     final type = translator.typesBuilder
         .defineStruct(name, fields: fields, superType: superType);
     if (translator.dynamicModuleSupportEnabled) {
-      // Pessimistically assume there will be subtypes in a dynamic module. This
+      // Pessimistically assume there will be subtypes in a submodule. This
       // ensures the struct is not final in all modules so the types are equal.
       type.hasAnySubtypes = true;
     }
@@ -406,10 +406,10 @@ class ClosureLayouter extends RecursiveVisitor {
       int typeCount, int positionalCount, List<String> names) {
     if (translator.dynamicModuleSupportEnabled) {
       if (typeCount == 0) {
-        return _dynamicModuleRepresentation ??=
+        return _dynamicSubmoduleRepresentation ??=
             _createRepresentation(typeCount, 0, const [], null, null, const []);
       }
-      return _dynamicModuleGenericRepresentation ??=
+      return _dynamicSubmoduleGenericRepresentation ??=
           _createRepresentation(typeCount, 0, const [], null, null, const []);
     }
     final representations =
@@ -524,7 +524,7 @@ class ClosureLayouter extends RecursiveVisitor {
       // generation, after the imports have been added.
 
       representation._instantiationTrampolinesGenerator = (module) {
-        // Dynamic modules do not have any trampolines, only a dynamic call
+        // Dynamic submodules do not have any trampolines, only a dynamic call
         // entry point.
         if (translator.dynamicModuleSupportEnabled) return const [];
         List<w.BaseFunction> instantiationTrampolines = [

pkg/dart2wasm/lib/code_generator.dart

@@ -1952,7 +1952,7 @@ abstract class AstCodeGenerator
     List<({Range range, Reference target})> targetRanges = targets.targetRanges;
     List<({Range range, Reference target})> staticDispatchRanges =
         targets.staticDispatchRanges;
-    if (!selector.isDynamicModuleOverrideable) {
+    if (!selector.isDynamicSubmoduleOverridable) {
       if (targetRanges.length == 1) {
         final target = translator.getFunctionEntry(targetRanges[0].target,
             uncheckedEntry: useUncheckedEntry);

pkg/dart2wasm/lib/compile.dart

@@ -174,14 +174,14 @@ Future<CompilationResult> compileToModule(
     compilerOptions.compileSdk = true;
   }
 
-  final dynamicModuleMainUri = await resolveUri(options.dynamicModuleMainUri);
+  final dynamicMainModuleUri = await resolveUri(options.dynamicMainModuleUri);
   final dynamicInterfaceUri = await resolveUri(options.dynamicInterfaceUri);
   final isDynamicMainModule =
       options.dynamicModuleType == DynamicModuleType.main;
   final isDynamicSubmodule =
       options.dynamicModuleType == DynamicModuleType.submodule;
   if (isDynamicSubmodule) {
-    compilerOptions.additionalDills.add(dynamicModuleMainUri!);
+    compilerOptions.additionalDills.add(dynamicMainModuleUri!);
 
     if (options.validateDynamicModules) {
       // We must pass the unresolved URI here to be compatible with the CFE
@@ -218,24 +218,24 @@ Future<CompilationResult> compileToModule(
   }
 
   var jsInteropMethods = js.performJSInteropTransformations(
-      component.getDynamicModuleLibraries(coreTypes),
+      component.getDynamicSubmoduleLibraries(coreTypes),
       coreTypes,
       classHierarchy);
 
   if (isDynamicSubmodule) {
-    // Join the dynamic module libraries with the TFAed component from the main
+    // Join the submodule libraries with the TFAed component from the main
     // module compilation. JS interop transformer must be run before this since
     // some methods it uses may have been tree-shaken from the TFAed component.
-    (component, jsInteropMethods) = await generateDynamicModuleComponent(
-        component, coreTypes, dynamicModuleMainUri!, jsInteropMethods);
+    (component, jsInteropMethods) = await generateDynamicSubmoduleComponent(
+        component, coreTypes, dynamicMainModuleUri!, jsInteropMethods);
     coreTypes = CoreTypes(component);
     classHierarchy =
         ClassHierarchy(component, coreTypes) as ClosedWorldClassHierarchy;
     libraryIndex = LibraryIndex(component, _librariesToIndex);
   }
 
   final librariesToTransform = isDynamicSubmodule
-      ? component.getDynamicModuleLibraries(coreTypes)
+      ? component.getDynamicSubmoduleLibraries(coreTypes)
       : component.libraries;
   final constantEvaluator = ConstantEvaluator(
       options, target, component, coreTypes, classHierarchy, libraryIndex);
@@ -245,7 +245,7 @@ Future<CompilationResult> compileToModule(
   final Map<RecordShape, Class> recordClasses = generateRecordClasses(
       component, coreTypes,
       isDynamicMainModule: isDynamicMainModule,
-      isDynamicModule: isDynamicSubmodule);
+      isDynamicSubmodule: isDynamicSubmodule);
   target.recordClasses = recordClasses;
 
   if (options.dumpKernelBeforeTfa != null) {
@@ -268,8 +268,8 @@ Future<CompilationResult> compileToModule(
         File.fromUri(dynamicInterfaceUri!).readAsStringSync(),
         options.dynamicInterfaceUri!);
   } else if (isDynamicSubmodule) {
-    moduleStrategy = DynamicModuleStrategy(
-        component, options, target, coreTypes, dynamicModuleMainUri!);
+    moduleStrategy = DynamicSubmoduleStrategy(
+        component, options, target, coreTypes, dynamicMainModuleUri!);
   } else {
     moduleStrategy = DefaultModuleStrategy(component);
   }
@@ -282,10 +282,10 @@ Future<CompilationResult> compileToModule(
   if (isDynamicSubmodule) {
     mainModuleMetadata =
         await deserializeMainModuleMetadata(component, options);
-    mainModuleMetadata.verifyDynamicModuleOptions(options);
+    mainModuleMetadata.verifyDynamicSubmoduleOptions(options);
   } else if (isDynamicMainModule) {
     MainModuleMetadata.verifyMainModuleOptions(options);
-    await serializeMainModuleComponent(component, dynamicModuleMainUri!,
+    await serializeMainModuleComponent(component, dynamicMainModuleUri!,
         optimized: false);
   }
 
@@ -340,7 +340,7 @@ Future<CompilationResult> compileToModule(
   final jsRuntimeFinalizer = js.RuntimeFinalizer(jsInteropMethods);
 
   final jsRuntime = isDynamicSubmodule
-      ? jsRuntimeFinalizer.generateDynamicModule(
+      ? jsRuntimeFinalizer.generateDynamicSubmodule(
           translator.functions.translatedProcedures,
           translator.internalizedStringsForJSRuntime)
       : jsRuntimeFinalizer.generate(
@@ -354,7 +354,7 @@ Future<CompilationResult> compileToModule(
   final supportJs = _generateSupportJs(options.translatorOptions);
   if (isDynamicMainModule) {
     await serializeMainModuleMetadata(component, translator, options);
-    await serializeMainModuleComponent(component, dynamicModuleMainUri!,
+    await serializeMainModuleComponent(component, dynamicMainModuleUri!,
         optimized: true);
   }
 

pkg/dart2wasm/lib/compiler_options.dart

@@ -17,7 +17,7 @@ class WasmCompilerOptions {
   String outputFile;
   String? depFile;
   DynamicModuleType? dynamicModuleType;
-  Uri? dynamicModuleMainUri;
+  Uri? dynamicMainModuleUri;
   Uri? dynamicInterfaceUri;
   Uri? dynamicModuleMetadataFile;
   bool validateDynamicModules = true;
@@ -45,7 +45,7 @@ class WasmCompilerOptions {
     }
 
     if (enableDynamicModules) {
-      if (dynamicModuleMainUri == null) {
+      if (dynamicMainModuleUri == null) {
         throw ArgumentError("--dynamic-module-main must be specified if "
             "compiling dynamic modules.");
       }

pkg/dart2wasm/lib/constant_evaluator.dart

@@ -34,7 +34,7 @@ class ConstantEvaluator extends kernel.ConstantEvaluator
       LibraryIndex libraryIndex)
       : _checkBounds = !options.translatorOptions.omitBoundsChecks,
         _minify = options.translatorOptions.minify,
-        _hasDynamicModuleSupport = options.dynamicModuleMainUri != null,
+        _hasDynamicModuleSupport = options.enableDynamicModules,
         _deferredLoadingEnabled =
             options.translatorOptions.enableDeferredLoading ||
                 options.translatorOptions.enableMultiModuleStressTestMode,