From 45bf30014439fad81424aaa26d14270577da4bf2 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 10 Feb 2016 11:24:17 +0300 Subject: [PATCH] Minor. Rename variables --- .../kotlin/codegen/builtinSpecialBridges.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt index f1d44767a0d..ddd18c7b6ad 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/builtinSpecialBridges.kt @@ -57,33 +57,33 @@ object BuiltinSpecialBridgesUtil { // e.g. `getSize()I` val methodItself = signatureByDescriptor(function) // e.g. `size()I` - val overriddenBuiltinSignature = signatureByDescriptor(overriddenBuiltin) + val specialBridgeSignature = signatureByDescriptor(overriddenBuiltin) val needGenerateSpecialBridge = needGenerateSpecialBridge( - function, reachableDeclarations, signatureByDescriptor, overriddenBuiltinSignature) + function, reachableDeclarations, signatureByDescriptor, specialBridgeSignature) val specialBridge = if (needGenerateSpecialBridge) - BridgeForBuiltinSpecial(overriddenBuiltinSignature, methodItself, isSpecial = true) + BridgeForBuiltinSpecial(specialBridgeSignature, methodItself, isSpecial = true) else null - val bridgesToGenerate = reachableDeclarations.mapTo(LinkedHashSet(), signatureByDescriptor) - bridgesToGenerate.remove(overriddenBuiltinSignature) + val commonBridges = reachableDeclarations.mapTo(LinkedHashSet(), signatureByDescriptor) + commonBridges.remove(specialBridgeSignature) val superImplementationDescriptor = findSuperImplementationForStubDelegation(function, fake) if (superImplementationDescriptor != null || !fake) { - bridgesToGenerate.remove(methodItself) + commonBridges.remove(methodItself) } if (fake) { for (overridden in function.overriddenDescriptors.map { it.original }) { if (!DescriptorBasedFunctionHandle(overridden).isAbstract) { - bridgesToGenerate.removeAll(findAllReachableDeclarations(overridden).map(signatureByDescriptor)) + commonBridges.removeAll(findAllReachableDeclarations(overridden).map(signatureByDescriptor)) } } } val bridges: MutableSet> = - (bridgesToGenerate.map { BridgeForBuiltinSpecial(it, overriddenBuiltinSignature) } + specialBridge.singletonOrEmptyList()).toMutableSet() + (commonBridges.map { BridgeForBuiltinSpecial(it, specialBridgeSignature) } + specialBridge.singletonOrEmptyList()).toMutableSet() if (superImplementationDescriptor != null) { bridges.add(BridgeForBuiltinSpecial(methodItself, signatureByDescriptor(superImplementationDescriptor), isDelegateToSuper = true))