Merge pull request #1287 from Friendseeker/empty-package-fix

Use the most up-to-date analysis for binary to source class name lookup
sbt · Dec 7, 2023 · be2bb54 · be2bb54
2 parents ead41be + d7a1ace
commit be2bb54
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/Incremental.scala
@@ -152,10 +152,6 @@ object Incremental {
     log.debug(s"[zinc] IncrementalCompile -----------")
     val previous = previous0 match { case a: Analysis => a }
     val currentStamper = Stamps.initial(stamper)
-    val internalBinaryToSourceClassName = (binaryClassName: String) =>
-      previous.relations.productClassName.reverse(binaryClassName).headOption
-    val internalSourceToClassNamesMap: VirtualFile => Set[String] = (f: VirtualFile) =>
-      previous.relations.classNames(f)
 
     val earlyJar = extractEarlyJar(earlyOutput)
     val pickleJarPair = earlyJar.map { p =>
@@ -183,8 +179,6 @@ object Incremental {
           runProfiler.timeCompilation(startTime, System.nanoTime() - startTime)
         },
         new AnalysisCallback.Builder(
-          internalBinaryToSourceClassName,
-          internalSourceToClassNamesMap,
           lookup.lookupAnalyzedClass(_, _),
           currentStamper,
           options,
@@ -250,13 +244,7 @@ object Incremental {
     log.debug("[zinc] compileAllJava")
     val previous = previous0 match { case a: Analysis => a }
     val currentStamper = Stamps.initial(stamper)
-    val internalBinaryToSourceClassName = (binaryClassName: String) =>
-      previous.relations.productClassName.reverse(binaryClassName).headOption
-    val internalSourceToClassNamesMap: VirtualFile => Set[String] =
-      (f: VirtualFile) => previous.relations.classNames(f)
     val builder = new AnalysisCallback.Builder(
-      internalBinaryToSourceClassName,
-      internalSourceToClassNamesMap,
       lookup.lookupAnalyzedClass(_, _),
       currentStamper,
       options,
@@ -537,8 +525,6 @@ private object AnalysisCallback {
 
   /** Allow creating new callback instance to be used in each compile iteration */
   class Builder(
-      internalBinaryToSourceClassName: String => Option[String],
-      internalSourceToClassNamesMap: VirtualFile => Set[String],
       externalAPI: (String, Option[VirtualFileRef]) => Option[AnalyzedClass],
       stampReader: ReadStamps,
       options: IncOptions,
@@ -560,9 +546,14 @@ private object AnalysisCallback {
     def build(): AnalysisCallback = buildImpl(None)
 
     private def buildImpl(incHandlerOpt: Option[Incremental.IncrementalCallback]) = {
+      val previousAnalysisOpt = incHandlerOpt.map(_.previousAnalysisPruned)
+      val binaryToSourceLookup: String => Option[String] = previousAnalysisOpt match {
+        case Some(analysis) => (binaryClassName: String) =>
+            analysis.relations.productClassName.reverse(binaryClassName).headOption
+        case None => _ => None
+      }
       new AnalysisCallback(
-        internalBinaryToSourceClassName,
-        internalSourceToClassNamesMap,
+        binaryToSourceLookup,
         externalAPI,
         stampReader,
         options,
@@ -585,7 +576,6 @@ private object AnalysisCallback {
 
 private final class AnalysisCallback(
     internalBinaryToSourceClassName: String => Option[String],
-    internalSourceToClassNamesMap: VirtualFile => Set[String],
     externalAPI: (String, Option[VirtualFileRef]) => Option[AnalyzedClass],
     stampReader: ReadStamps,
     options: IncOptions,

diff --git a/zinc/src/sbt-test/source-dependencies/empty-package/test b/zinc/src/sbt-test/source-dependencies/empty-package/test
@@ -3,7 +3,13 @@ $ copy-file changes/Use.scala Use.scala
 > compile
 
 $ copy-file changes/Define2.scala Define.scala
-> compile
+
+# We usually call `compile` right before a checkDependencies call
+# However, as per https://github.com/sbt/zinc/pull/1287#issue-2010864729
+# The check would be too late to catch the missing dependency between a.Use and pkgName.Test
+# As invalidateInitial introduces library dependency between a.Use and pkgName.Test
+
+> checkDependencies a.Use: pkgName.Test
 
 $ delete Define.scala
 -> compile