Restore changes for ExtractAPI. Move miniphase to transformers batch.

Author: BarkingBad

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -42,7 +42,6 @@ class Compiler {
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
     List(new PostTyper) ::          // Additional checks and cleanups after type checking
     List(new sjs.PrepJSInterop) ::  // Additional checks and transformations for Scala.js (Scala.js only)
-    List(new CollectEntryPoints) :: // Collect all entry points and save them in the context
     List(new sbt.ExtractAPI) ::     // Sends a representation of the API of classes to sbt via callbacks
     List(new SetRootTree) ::        // Set the `rootTreeOrProvider` on class symbols
     Nil
@@ -131,6 +130,7 @@ class Compiler {
          new RestoreScopes,          // Repair scopes rendered invalid by moving definitions in prior phases of the group
          new SelectStatic,           // get rid of selects that would be compiled into GetStatic
          new sjs.JUnitBootstrappers, // Generate JUnit-specific bootstrapper classes for Scala.js (not enabled by default)
+         new CollectEntryPoints,     // Collect all entry points and save them in the context
          new CollectSuperCalls,      // Find classes that are called with super
          new RepeatableAnnotations) :: // Aggregate repeatable annotations
     Nil

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

@@ -66,7 +66,7 @@ class ExtractAPI extends Phase {
 
     val apiTraverser = new ExtractAPICollector
     val classes = apiTraverser.apiSource(unit.tpdTree)
-    val mainClasses = ctx.entryPoints.toSet
+    val mainClasses = apiTraverser.mainClasses
 
     if (ctx.settings.YdumpSbtInc.value) {
       // Append to existing file that should have been created by ExtractDependencies
@@ -144,6 +144,7 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
   private val refinedTypeCache = new mutable.HashMap[(api.Type, api.Definition), api.Structure]
 
   private val allNonLocalClassesInSrc = new mutable.HashSet[xsbti.api.ClassLike]
+  private val _mainClasses = new mutable.HashSet[String]
 
   private object Constants {
     val emptyStringArray = Array[String]()
@@ -194,6 +195,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
   def apiClass(sym: ClassSymbol): api.ClassLikeDef =
     classLikeCache.getOrElseUpdate(sym, computeClass(sym))
 
+  def mainClasses: Set[String] = {
+    forceThunks()
+    _mainClasses.toSet
+  }
+
   private def computeClass(sym: ClassSymbol): api.ClassLikeDef = {
     import xsbti.api.{DefinitionType => dt}
     val defType =
@@ -228,6 +234,11 @@ private class ExtractAPICollector(using Context) extends ThunkHolder {
 
     allNonLocalClassesInSrc += cl
 
+    if (sym.isStatic && !sym.is(Trait) && ctx.platform.hasMainMethod(sym)) {
+       // If sym is an object, all main methods count, otherwise only @static ones count.
+      _mainClasses += name
+    }
+
     api.ClassLikeDef.of(name, acc, modifiers, anns, tparams, defType)
   }