Merge pull request #4960 from sjrd/linkedclass-hasdirectinstances

sjrd · web-flow · commit 27bd1b885424 · 2024-03-17T00:18:54.000+01:00
Add LinkedClass.hasDirectInstances.
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/ClassEmitter.scala
@@ -826,7 +826,7 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
 
   def genTypeData(className: ClassName, kind: ClassKind,
       superClass: Option[ClassIdent], ancestors: List[ClassName],
-      jsNativeLoadSpec: Option[JSNativeLoadSpec], hasInstances: Boolean)(
+      jsNativeLoadSpec: Option[JSNativeLoadSpec], hasDirectInstances: Boolean)(
       implicit moduleContext: ModuleContext,
       globalKnowledge: GlobalKnowledge, pos: Position): WithGlobals[List[js.Tree]] = {
     import TreeDSL._
@@ -847,7 +847,7 @@ private[emitter] final class ClassEmitter(sjsGen: SJSGen) {
     val kindOrCtorParam = {
       if (isJSType) js.IntLiteral(2)
       else if (kind == ClassKind.Interface) js.IntLiteral(1)
-      else if (kind.isClass && hasInstances) globalVar(VarField.c, className)
+      else if (kind.isClass && hasDirectInstances) globalVar(VarField.c, className)
       else js.IntLiteral(0)
     }
 
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala b/linker/shared/src/main/scala/org/scalajs/linker/backend/emitter/Emitter.scala
@@ -716,14 +716,14 @@ final class Emitter[E >: Null <: js.Tree](
 
       if (linkedClass.hasRuntimeTypeInfo) {
         main ++= extractWithGlobals(classTreeCache.typeData.getOrElseUpdate(
-            linkedClass.hasInstances,
+            linkedClass.hasDirectInstances,
             classEmitter.genTypeData(
               className, // invalidated by overall class cache (part of ancestors)
               kind, // invalidated by class version
               linkedClass.superClass, // invalidated by class version
               linkedClass.ancestors, // invalidated by overall class cache (identity)
               linkedClass.jsNativeLoadSpec, // invalidated by class version
-              linkedClass.hasInstances // invalidated directly (it is the input to `getOrElseUpdate`)
+              linkedClass.hasDirectInstances // invalidated directly (it is the input to `getOrElseUpdate`)
             )(moduleContext, classCache, linkedClass.pos).map(postTransform(_, 0))))
       }
     }
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/frontend/BaseLinker.scala b/linker/shared/src/main/scala/org/scalajs/linker/frontend/BaseLinker.scala
@@ -166,6 +166,7 @@ private[frontend] object BaseLinker {
         classDef.pos,
         ancestors.toList,
         hasInstances = classInfo.isAnySubclassInstantiated,
+        hasDirectInstances = classInfo.isInstantiated,
         hasInstanceTests = classInfo.areInstanceTestsUsed,
         hasRuntimeTypeInfo = classInfo.isDataAccessed,
         fieldsRead = classInfo.fieldsRead.toSet,
diff --git a/linker/shared/src/main/scala/org/scalajs/linker/standard/LinkedClass.scala b/linker/shared/src/main/scala/org/scalajs/linker/standard/LinkedClass.scala
@@ -55,6 +55,7 @@ final class LinkedClass(
     // Actual Linking info
     val ancestors: List[ClassName],
     val hasInstances: Boolean,
+    val hasDirectInstances: Boolean,
     val hasInstanceTests: Boolean,
     val hasRuntimeTypeInfo: Boolean,
     val fieldsRead: Set[FieldName],
diff --git a/project/BinaryIncompatibilities.scala b/project/BinaryIncompatibilities.scala
@@ -24,6 +24,9 @@ object BinaryIncompatibilities {
   )
 
   val Linker = Seq(
+    // !!! Breaking, OK in minor release
+    ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.LinkedClass.this"),
+
     // private, not an issue
     ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.CommonPhaseConfig.this"),
   )

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,9 @@ object BinaryIncompatibilities {`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	`val Linker = Seq(`
	`27`	`+ // !!! Breaking, OK in minor release`
	`28`	`+ ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.LinkedClass.this"),`
	`29`	`+`
`27`	`30`	`// private, not an issue`
`28`	`31`	`ProblemFilters.exclude[DirectMissingMethodProblem]("org.scalajs.linker.standard.CommonPhaseConfig.this"),`
`29`	`32`	`)`