Drop unnecessary check and corresponding parameter

This commit is contained in:
Denis Zharkov
2016-02-09 20:10:21 +03:00
parent 0b37d032c8
commit 8592a57be4
@@ -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 <Signature> needGenerateSpecialBridge(
functionDescriptor: FunctionDescriptor,
reachableDeclarations: Collection<FunctionDescriptor>,
specialCallableDescriptor: CallableMemberDescriptor,
signatureByDescriptor: (FunctionDescriptor) -> Signature,
overriddenBuiltinSignature: Signature
): Boolean {
@@ -128,8 +127,6 @@ private fun <Signature> 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)