Fix binary dependency from tasty

scala · Jun 5, 2023 · e545d54 · e545d54
1 parent ac4d40e
commit e545d54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala b/compiler/src/dotty/tools/dotc/sbt/ExtractDependencies.scala
@@ -142,13 +142,12 @@ class ExtractDependencies extends Phase {
     if (depFile != null) {
       // Cannot ignore inheritance relationship coming from the same source (see sbt/zinc#417)
       def allowLocal = dep.context == DependencyByInheritance || dep.context == LocalDependencyByInheritance
-      if (depFile.isClass) {
+      val depClassFile =
+        if depFile.isClass then depFile
+        else depFile.resolveSibling(dep.to.binaryClassName + ".class")
+      if (depClassFile != null) {
         // Dependency is external -- source is undefined
-        processExternalDependency(depFile, dep.to.binaryClassName)
-      // } else if (depFile.isTasty) {
-      //   val depClassFile = depFile.resolveSibling(dep.to.binaryClassName + ".class")
-      //   if depClassFile != null then
-      //     processExternalDependency(depClassFile, dep.to.binaryClassName)
+        processExternalDependency(depClassFile, dep.to.binaryClassName)
       } else if (allowLocal || depFile.file != sourceFile) {
         // We cannot ignore dependencies coming from the same source file because
         // the dependency info needs to propagate. See source-dependencies/trait-trait-211.

diff --git a/sbt-test/source-dependencies/binary/test b/sbt-test/source-dependencies/binary/test
@@ -3,4 +3,4 @@
 $ sleep 2000
 
 $ copy-file changes/Break.scala dep/A.scala
-# FIXME -> use/compile
+-> use/compile