From 8592a57be4089393628739dc3fbbdf079d071b5d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 9 Feb 2016 20:10:21 +0300 Subject: [PATCH] Drop unnecessary check and corresponding parameter --- .../org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt | 5 +---- 1 file changed, 1 insertion(+), 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 1d3a39af0b2..2bb8b72957d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt @@ -60,7 +60,7 @@ object BuiltinSpecialBridgesUtil { val overriddenBuiltinSignature = signatureByDescriptor(overriddenBuiltin) val needGenerateSpecialBridge = needGenerateSpecialBridge( - function, reachableDeclarations, overriddenBuiltin, signatureByDescriptor, overriddenBuiltinSignature) + function, reachableDeclarations, signatureByDescriptor, overriddenBuiltinSignature) val specialBridge = if (needGenerateSpecialBridge) BridgeForBuiltinSpecial(overriddenBuiltinSignature, methodItself, isSpecial = true) @@ -117,7 +117,6 @@ private fun findAllReachableDeclarations(functionDescriptor: FunctionDescriptor) private fun needGenerateSpecialBridge( functionDescriptor: FunctionDescriptor, reachableDeclarations: Collection, - specialCallableDescriptor: CallableMemberDescriptor, signatureByDescriptor: (FunctionDescriptor) -> Signature, overriddenBuiltinSignature: Signature ): Boolean { @@ -128,8 +127,6 @@ private fun needGenerateSpecialBridge( // and there should be special bridge in latter case. if (signatureByDescriptor(functionDescriptor) == overriddenBuiltinSignature) return false - if (specialCallableDescriptor.modality == Modality.FINAL) return false - // Is there Kotlin superclass that already has generated special bridge if (functionDescriptor.firstOverridden { overridden -> // Ignore itself and non-functions (the latter may be assertion)