Fix the test by ignoring synthetic symbols

Author: eed3si9n

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

@@ -16,6 +16,7 @@ import dotty.tools.dotc.core.NameOps.*
 import dotty.tools.dotc.core.Names.*
 import dotty.tools.dotc.core.Phases.*
 import dotty.tools.dotc.core.Symbols.*
+import dotty.tools.dotc.core.Definitions
 import dotty.tools.dotc.core.Denotations.StaleSymbol
 import dotty.tools.dotc.core.Types.*
 
@@ -75,7 +76,7 @@ class ExtractDependencies extends Phase {
   override def run(using Context): Unit = {
     val unit = ctx.compilationUnit
     val rec = unit.depRecorder
-    val collector = ExtractDependenciesCollector(rec)
+    val collector = ExtractDependenciesCollector(rec, defn)
     collector.traverse(unit.tpdTree)
 
     if (ctx.settings.YdumpSbtInc.value) {
@@ -137,7 +138,7 @@ object ExtractDependencies {
  *  specially, see the subsection "Dependencies introduced by member reference and
  *  inheritance" in the "Name hashing algorithm" section.
  */
-private class ExtractDependenciesCollector(rec: DependencyRecorder) extends tpd.TreeTraverser { thisTreeTraverser =>
+private class ExtractDependenciesCollector(rec: DependencyRecorder, defn: Definitions) extends tpd.TreeTraverser { thisTreeTraverser =>
   import tpd.*
 
   private def addMemberRefDependency(sym: Symbol)(using Context): Unit =
@@ -169,14 +170,23 @@ private class ExtractDependenciesCollector(rec: DependencyRecorder) extends tpd.
     if cls.isLocal then LocalDependencyByInheritance
     else DependencyByInheritance
 
+  private val ignoredSymbols = Set[Symbol](
+    defn.syntheticScalaClasses*
+  ) ++ Set(
+    defn.ClassClass,
+    defn.ModuleSerializationProxyClass,
+    defn.ModuleSerializationProxyConstructor,
+  )
+
   private def ignoreDependency(sym: Symbol)(using Context) =
     try
       !sym.exists ||
       sym.isAbsent(canForce = false) || // ignore dependencies that have a symbol but do not exist.
                                         // e.g. java.lang.Object companion object
       sym.isEffectiveRoot ||
       sym.isAnonymousFunction ||
-      sym.isAnonymousClass
+      sym.isAnonymousClass ||
+      ignoredSymbols(sym)
     catch case ex: StaleSymbol =>
       // can happen for constructor proxies. Test case is pos-macros/i13532.
       true

sbt-bridge/test/xsbt/ExtractUsedNamesSpecification.scala

@@ -78,10 +78,10 @@ class ExtractUsedNamesSpecification {
     val compilerForTesting = new ScalaCompilerForUnitTesting
     val usedNames = compilerForTesting.extractUsedNamesFromSrc(srcA, srcB, srcC, srcD)
     val scalaVersion = scala.util.Properties.versionNumberString
-    val namesA = standardNames ++ Set("Nothing", "Any")
-    val namesAX = standardNames ++ Set("x", "T", "A", "Nothing", "Any")
+    val namesA = standardNames
+    val namesAX = standardNames ++ Set("x", "T", "A")
     val namesB = Set("A", "Int", "A;init;", "Unit")
-    val namesC = Set("B;init;", "B", "Unit")
+    val namesC = Set("B;init;", "B", "Unit", "Object")
     val namesD = standardNames ++ Set("C", "X", "foo", "Int", "T")
     assertEquals(namesA, usedNames("A"))
     assertEquals(namesAX, usedNames("A.X"))
@@ -143,17 +143,15 @@ class ExtractUsedNamesSpecification {
            "M",
            "N",
            "Predef",
-           "???",
-           "Nothing")
+           "???")
     val expectedNames_bar =
       standardNames ++
        Set("B",
            "bar",
            "P1",
            "P0",
            "Predef",
-           "???",
-           "Nothing")
+           "???")
     assertEquals(expectedNames_lista, usedNames("Test_lista"))
     assertEquals(expectedNames_at, usedNames("Test_at"))
     assertEquals(expectedNames_as, usedNames("Test_as"))

sbt-test/source-dependencies/inline-rec-change-inline/test

@@ -6,4 +6,4 @@ $ copy-file changes/B1.scala B.scala
 > compile
 # 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
 # then 1 final compilation to recompile C due to A.callInline change
-> checkIterations 3
+> checkIterations 2

sbt-test/source-dependencies/inline-rec-change-param/test

@@ -6,4 +6,4 @@ $ copy-file changes/B1.scala B.scala
 > compile
 # 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
 # then 1 final compilation to recompile C due to A.callInline change
-> checkIterations 3
+> checkIterations 2

sbt-test/source-dependencies/inline-rec-change-res-transparent/test

@@ -6,4 +6,4 @@ $ copy-file changes/B1.scala B.scala
 > compile
 # 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
 # then 1 final compilation to recompile C due to A.callInline change
-> checkIterations 3
+> checkIterations 2

sbt-test/source-dependencies/inline-rec-change-res/test

@@ -6,4 +6,4 @@ $ copy-file changes/B1.scala B.scala
 > compile
 # 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
 # then 1 final compilation to recompile C due to A.callInline change
-> checkIterations 3
+> checkIterations 2

sbt-test/source-dependencies/inline-rec-change-typaram/test

@@ -6,4 +6,4 @@ $ copy-file changes/B1.scala B.scala
 > compile
 # 1 to recompile B, then 1 more to recompile A due to B.inlinedAny change,
 # then 1 final compilation to recompile C due to A.callInline change
-> checkIterations 3
+> checkIterations 2

sbt-test/source-dependencies/inline-rec-deep/test

@@ -7,4 +7,4 @@ $ copy-file changes/C1.scala C.scala
 # 1 to recompile C, then 1 more to recompile B due to C.inlinedAny change,
 # then 1 more to recompile A due to B.delegated change, then 1 final compilation
 # to recompile D due to A.callInline change
-> checkIterations 4
+> checkIterations 3