From 8cce5dc8ded634c7a0210252c73fe5cf853c0d75 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 3 Apr 2019 13:35:02 +0200 Subject: [PATCH] Fix missing return for checkViaDescriptors in FqNameEqualityChecker --- .../kotlin/ir/symbols/IrClassifierEqualityChecker.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt index b5ae70a7794..5137999f391 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/symbols/IrClassifierEqualityChecker.kt @@ -17,7 +17,9 @@ interface IrClassifierEqualityChecker { object FqNameEqualityChecker : IrClassifierEqualityChecker { override fun areEqual(left: IrClassifierSymbol, right: IrClassifierSymbol): Boolean { 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) } @@ -54,4 +56,4 @@ object FqNameEqualityChecker : IrClassifierEqualityChecker { } private fun checkViaDescriptors(c1: ClassifierDescriptor, c2: ClassifierDescriptor) = c1.typeConstructor == c2.typeConstructor -} \ No newline at end of file +}