azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing return for checkViaDescriptors in FqNameEqualityChecker

Browse Source
This commit is contained in:
Alexander Udalov
2019-04-03 13:35:02 +02:00
parent bdfe82cfff
commit 8cce5dc8de
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt
+4 -2
View File
@@ -17,7 +17,9 @@ interface IrClassifierEqualityChecker {
object FqNameEqualityChecker : IrClassifierEqualityChecker { object FqNameEqualityChecker : IrClassifierEqualityChecker {
override fun areEqual(left: IrClassifierSymbol, right: IrClassifierSymbol): Boolean { override fun areEqual(left: IrClassifierSymbol, right: IrClassifierSymbol): Boolean {
if (left === right) return true if (left === right) return true
if (!left.isBound || !right.isBound) checkViaDescriptors(left.descriptor, right.descriptor) if (!left.isBound || !right.isBound) {
return checkViaDescriptors(left.descriptor, right.descriptor)
}
return checkViaDeclarations(left.owner, right.owner) return checkViaDeclarations(left.owner, right.owner)
} }
@@ -54,4 +56,4 @@ object FqNameEqualityChecker : IrClassifierEqualityChecker {
} }
private fun checkViaDescriptors(c1: ClassifierDescriptor, c2: ClassifierDescriptor) = c1.typeConstructor == c2.typeConstructor private fun checkViaDescriptors(c1: ClassifierDescriptor, c2: ClassifierDescriptor) = c1.typeConstructor == c2.typeConstructor
} }