From 9efd50c49c3a4ab5f60f6ca633a453a9ac3462c1 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 30 Jun 2016 20:11:56 +0300 Subject: [PATCH] Minor. Cleanup getSpecialBridgeSignatureIfExists --- .../org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt index fbb0daad1d5..b1e0b8ca40f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt @@ -167,19 +167,19 @@ private fun findAllReachableDeclarations( private fun CallableMemberDescriptor.getSpecialBridgeSignatureIfExists( signatureByDescriptor: (FunctionDescriptor) -> Signature ): Signature? { - // Ignore itself and non-functions (may be assertion) + // Only functions should be considered here (may be assertion) if (this !is FunctionDescriptor) return null // Only Kotlin classes can have special bridges if (containingDeclaration is JavaClassDescriptor || DescriptorUtils.isInterface(containingDeclaration)) return null // Getting original is necessary here, because we want to determine JVM signature of descriptor as it was declared in containing class - val originalOverridden = original - val overriddenSpecial = originalOverridden.getOverriddenBuiltinReflectingJvmDescriptor() ?: return null + val originalOverride = original + val overriddenSpecial = originalOverride.getOverriddenBuiltinReflectingJvmDescriptor() ?: return null val specialBridgeSignature = signatureByDescriptor(overriddenSpecial) // Does special bridge has different signature - if (signatureByDescriptor(originalOverridden) == specialBridgeSignature) return null + if (signatureByDescriptor(originalOverride) == specialBridgeSignature) return null return specialBridgeSignature }