Skip to content

Commit 246dfc4

Browse files
committed
simplify file comparison
1 parent aa27580 commit 246dfc4

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

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

+1-4
Original file line numberDiff line numberDiff 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)

0 commit comments

Comments
 (0)