Add a flag to class level info for dynamic import

This allows us to remove a field from `ReachabilityInfoInClass` which reduces the retained size on the test suite for the infos as follows: BaseLinker: 24MB -> 23MB Refiner: 20MB -> 20MB (within rounding error)
scala-js · Apr 13, 2024 · a54c022 · a54c022
1 parent 6dcd1b7
commit a54c022
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Analyzer.scala b/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Analyzer.scala
@@ -1432,6 +1432,13 @@ private class AnalyzerRun(config: CommonPhaseConfig, initial: Boolean,
           if ((flags & ReachabilityInfoInClass.FlagStaticallyReferenced) != 0) {
             moduleUnit.addStaticDependency(className)
           }
+
+          if ((flags & ReachabilityInfoInClass.FlagDynamicallyReferenced) != 0) {
+            if (isNoModule)
+              _errors ::= DynamicImportWithoutModuleSupport(from)
+            else
+              moduleUnit.addDynamicDependency(className)
+          }
         }
 
         /* Since many of the lists below are likely to be empty, we always
@@ -1467,17 +1474,6 @@ private class AnalyzerRun(config: CommonPhaseConfig, initial: Boolean,
             clazz.callMethodStatically(methodName)
         }
 
-        if (!dataInClass.methodsCalledDynamicImport.isEmpty) {
-          if (isNoModule) {
-            _errors ::= DynamicImportWithoutModuleSupport(from)
-          } else {
-            moduleUnit.addDynamicDependency(className)
-            // In terms of reachability, a dynamic import call is just a static call.
-            for (methodName <- dataInClass.methodsCalledDynamicImport)
-              clazz.callMethodStatically(methodName)
-          }
-        }
-
         if (!dataInClass.jsNativeMembersUsed.isEmpty) {
           for (member <- dataInClass.jsNativeMembersUsed)
             clazz.useJSNativeMember(member)

diff --git a/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Infos.scala b/linker/shared/src/main/scala/org/scalajs/linker/analyzer/Infos.scala
@@ -115,7 +115,6 @@ object Infos {
       val staticFieldsWritten: List[FieldName],
       val methodsCalled: List[MethodName],
       val methodsCalledStatically: List[NamespacedMethodName],
-      val methodsCalledDynamicImport: List[NamespacedMethodName],
       val jsNativeMembersUsed: List[MethodName],
       val flags: ReachabilityInfoInClass.Flags
   )
@@ -132,6 +131,7 @@ object Infos {
     final val FlagInstanceTestsUsed = 1 << 2
     final val FlagClassDataAccessed = 1 << 3
     final val FlagStaticallyReferenced = 1 << 4
+    final val FlagDynamicallyReferenced = 1 << 5
   }
 
   final class ClassInfoBuilder(
@@ -384,7 +384,6 @@ object Infos {
     private val staticFieldsWritten = mutable.Set.empty[FieldName]
     private val methodsCalled = mutable.Set.empty[MethodName]
     private val methodsCalledStatically = mutable.Set.empty[NamespacedMethodName]
-    private val methodsCalledDynamicImport = mutable.Set.empty[NamespacedMethodName]
     private val jsNativeMembersUsed = mutable.Set.empty[MethodName]
     private var flags: ReachabilityInfoInClass.Flags = 0
 
@@ -423,7 +422,9 @@ object Infos {
     }
 
     def addMethodCalledDynamicImport(method: NamespacedMethodName): this.type = {
-      methodsCalledDynamicImport += method
+      // In terms of reachability, a dynamic import call is just a static call.
+      methodsCalledStatically += method
+      setFlag(ReachabilityInfoInClass.FlagDynamicallyReferenced)
       this
     }
 
@@ -461,7 +462,6 @@ object Infos {
           staticFieldsWritten = toLikelyEmptyList(staticFieldsWritten),
           methodsCalled = toLikelyEmptyList(methodsCalled),
           methodsCalledStatically = toLikelyEmptyList(methodsCalledStatically),
-          methodsCalledDynamicImport = toLikelyEmptyList(methodsCalledDynamicImport),
           jsNativeMembersUsed = toLikelyEmptyList(jsNativeMembersUsed),
           flags = flags
       )