From a2627431f87712df7714c190d239e0a706f4e16c Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 16 Nov 2015 13:05:39 +0300
Subject: [PATCH] Minor. Cleanup and refine naming

---
 .../kotlin/load/java/specialBuiltinMembers.kt      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
index 6a9675003e6..798037373cb 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/specialBuiltinMembers.kt
@@ -108,7 +108,7 @@ object BuiltinMethodsWithSpecialGenericSignature {
             ERASED_VALUE_PARAMETERS_FQ_NAMES.map { it.shortName() }.toSet()
 
     private val CallableMemberDescriptor.hasErasedValueParametersInJava: Boolean
-        get() = fqNameOrNull() in ERASED_VALUE_PARAMETERS_FQ_NAMES
+        get() = ERASED_VALUE_PARAMETERS_FQ_NAMES.containsRaw(fqNameOrNull())
 
     @JvmStatic
     fun getOverriddenBuiltinFunctionWithErasedValueParametersInJava(
@@ -225,15 +225,15 @@ fun getJvmMethodNameIfSpecial(callableMemberDescriptor: CallableMemberDescriptor
                 && containingDeclaration.kind == ClassKind.ENUM_CLASS) return DescriptorUtils.ENUM_VALUES.asString()
     }
 
-    val builtinOverridden = getBuiltinOverriddenThatAffectsJvmName(callableMemberDescriptor)?.propertyIfAccessor
-            ?: return null
-    return when (builtinOverridden) {
-        is PropertyDescriptor -> builtinOverridden.getBuiltinSpecialPropertyGetterName()
-        else -> BuiltinMethodsWithDifferentJvmName.getJvmName(builtinOverridden)?.asString()
+    val overriddenBuiltin = getOverriddenBuiltinThatAffectsJvmName(callableMemberDescriptor)?.propertyIfAccessor
+                            ?: return null
+    return when (overriddenBuiltin) {
+        is PropertyDescriptor -> overriddenBuiltin.getBuiltinSpecialPropertyGetterName()
+        else -> BuiltinMethodsWithDifferentJvmName.getJvmName(overriddenBuiltin)?.asString()
     }
 }
 
-private fun getBuiltinOverriddenThatAffectsJvmName(
+private fun getOverriddenBuiltinThatAffectsJvmName(
         callableMemberDescriptor: CallableMemberDescriptor
 ): CallableMemberDescriptor? {
     val overriddenBuiltin = callableMemberDescriptor.getOverriddenBuiltinWithDifferentJvmName() ?: return null