Wasm: Compute tableEntries in Preprocessor.

sjrd · sjrd · commit 427dd73e16e2 · 2024-08-05T12:12:55.000+02:00
`ClassInfo` is now completely immutable.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/Preprocessor.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/Preprocessor.scala
@@ -44,6 +44,7 @@ object Preprocessor {
         clazz,
         staticFieldMirrors.getOrElse(clazz.className, Map.empty),
         specialInstanceTypes.getOrElse(clazz.className, 0),
+        abstractMethodCalls.getOrElse(clazz.className, Set.empty),
         itableBucketAssignments.getOrElse(clazz.className, -1),
         clazz.superClass.map(sup => classInfosBuilder(sup.name))
       )
@@ -61,11 +62,6 @@ object Preprocessor {
     // sort for stability
     val reflectiveProxyIDs = definedReflectiveProxyNames.toList.sorted.zipWithIndex.toMap
 
-    for (clazz <- classes) {
-      classInfos(clazz.className).buildMethodTable(
-          abstractMethodCalls.getOrElse(clazz.className, Set.empty))
-    }
-
     new WasmContext(classInfos, reflectiveProxyIDs, itableBucketCount)
   }
 
@@ -118,6 +114,7 @@ object Preprocessor {
       clazz: LinkedClass,
       staticFieldMirrors: Map[FieldName, List[String]],
       specialInstanceTypes: Int,
+      methodsCalledDynamically0: Set[MethodName],
       itableIdx: Int,
       superClass: Option[ClassInfo]
   ): ClassInfo = {
@@ -187,12 +184,38 @@ object Preprocessor {
       }
     }
 
+    val tableEntries: List[MethodName] = {
+      val methodsCalledDynamically: List[MethodName] =
+        if (clazz.hasInstances) methodsCalledDynamically0.toList
+        else Nil
+
+      kind match {
+        case ClassKind.Class | ClassKind.ModuleClass | ClassKind.HijackedClass =>
+          val superTableEntries = superClass.fold[List[MethodName]](Nil)(_.tableEntries)
+          val superTableEntrySet = superTableEntries.toSet
+
+          /* When computing the table entries to add for this class, exclude
+           * methods that are already in the super class' table entries.
+           */
+          val newTableEntries = methodsCalledDynamically
+            .filter(!superTableEntrySet.contains(_))
+            .sorted // for stability
+
+          superTableEntries ::: newTableEntries
+
+        case ClassKind.Interface =>
+          methodsCalledDynamically.sorted // for stability
+
+        case _ =>
+          Nil
+      }
+    }
+
     new ClassInfo(
       className,
       kind,
       clazz.jsClassCaptures,
       allFieldDefs,
-      superClass,
       classImplementsAnyInterface,
       clazz.hasInstances,
       !clazz.hasDirectInstances,
@@ -202,6 +225,7 @@ object Preprocessor {
       staticFieldMirrors,
       specialInstanceTypes,
       resolvedMethodInfos,
+      tableEntries,
       itableIdx
     )
   }
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/WasmContext.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/WasmContext.scala
@@ -169,7 +169,6 @@ object WasmContext {
       val kind: ClassKind,
       val jsClassCaptures: Option[List[ParamDef]],
       val allFieldDefs: List[FieldDef],
-      superClass: Option[ClassInfo],
       val classImplementsAnyInterface: Boolean,
       val hasInstances: Boolean,
       val isAbstract: Boolean,
@@ -179,14 +178,12 @@ object WasmContext {
       val staticFieldMirrors: Map[FieldName, List[String]],
       _specialInstanceTypes: Int,
       val resolvedMethodInfos: Map[MethodName, ConcreteMethodInfo],
+      val tableEntries: List[MethodName],
       _itableIdx: Int
   ) {
     override def toString(): String =
       s"ClassInfo(${name.nameString})"
 
-    /** For a class or interface, its table entries in definition order. */
-    private var _tableEntries: List[MethodName] = null
-
     /** Returns the index of this interface's itable in the classes' interface tables.
      *
      *  Only interfaces that have instances get an itable index.
@@ -246,42 +243,6 @@ object WasmContext {
 
     def isInterface: Boolean =
       kind == ClassKind.Interface
-
-    def buildMethodTable(methodsCalledDynamically0: Set[MethodName]): Unit = {
-      if (_tableEntries != null)
-        throw new IllegalStateException(s"Duplicate call to buildMethodTable() for $name")
-
-      val methodsCalledDynamically: List[MethodName] =
-        if (hasInstances) methodsCalledDynamically0.toList
-        else Nil
-
-      kind match {
-        case ClassKind.Class | ClassKind.ModuleClass | ClassKind.HijackedClass =>
-          val superTableEntries = superClass.fold[List[MethodName]](Nil)(_.tableEntries)
-          val superTableEntrySet = superTableEntries.toSet
-
-          /* When computing the table entries to add for this class, exclude
-           * methods that are already in the super class' table entries.
-           */
-          val newTableEntries = methodsCalledDynamically
-            .filter(!superTableEntrySet.contains(_))
-            .sorted // for stability
-
-          _tableEntries = superTableEntries ::: newTableEntries
-
-        case ClassKind.Interface =>
-          _tableEntries = methodsCalledDynamically.sorted // for stability
-
-        case _ =>
-          _tableEntries = Nil
-      }
-    }
-
-    def tableEntries: List[MethodName] = {
-      if (_tableEntries == null)
-        throw new IllegalStateException(s"Table not yet built for $name")
-      _tableEntries
-    }
   }
 
   final class ConcreteMethodInfo(val ownerClass: ClassName, val methodName: MethodName) {
