File tree Expand file tree Collapse file tree 1 file changed +1
-4
lines changed
compiler/src/dotty/tools/dotc/sbt Expand file tree Collapse file tree 1 file changed +1
-4
lines changed Original file line number Diff line number Diff line change @@ -139,9 +139,6 @@ class ExtractDependencies extends Phase {
139139
140140 val depFile = dep.to.associatedFile
141141 if (depFile != null ) {
142- def depIsSameSource =
143- depFile.absolutePath == sourceFile.file.absolutePath
144-
145142 // Cannot ignore inheritance relationship coming from the same source (see sbt/zinc#417)
146143 def allowLocal = dep.context == DependencyByInheritance || dep.context == LocalDependencyByInheritance
147144 val depClassFile =
@@ -150,7 +147,7 @@ class ExtractDependencies extends Phase {
150147 if (depClassFile != null ) {
151148 // Dependency is external -- source is undefined
152149 processExternalDependency(depClassFile, dep.to.binaryClassName)
153- } else if (allowLocal || ! depIsSameSource /* old: depFile.file != sourceFile.file */ ) {
150+ } else if (allowLocal || depFile != sourceFile.file) {
154151 // We cannot ignore dependencies coming from the same source file because
155152 // the dependency info needs to propagate. See source-dependencies/trait-trait-211.
156153 val toClassName = classNameAsString(dep.to)
You can’t perform that action at this time.
0 commit comments