Refactoring. Some simplifications in OverloadingConflictResolver.

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadChecker.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.calls.results.*
 import org.jetbrains.kotlin.resolve.calls.tower.getTypeAliasConstructors
 import org.jetbrains.kotlin.resolve.descriptorUtil.hasLowPriorityInOverloadResolution
+import org.jetbrains.kotlin.resolve.descriptorUtil.varargParameterPosition
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.kt

@@ -24,11 +24,11 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.descriptors.Visibilities
 import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode
-import org.jetbrains.kotlin.resolve.calls.inference.toHandle
 import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionMutableResolvedCall
 import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
+import org.jetbrains.kotlin.resolve.descriptorUtil.varargParameterPosition
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 
@@ -160,7 +160,7 @@ class OverloadingConflictResolver(
             if (isGeneric1 && isGeneric2) return false
         }
 
-        return isSignatureNotLessSpecific(call1, call2, SpecificityComparisonWithNumerics, specificityComparator, call1.callHandle())
+        return isSignatureNotLessSpecific(call1, call2, SpecificityComparisonWithNumerics, specificityComparator)
     }
 
     private val SpecificityComparisonWithNumerics = object : SpecificityComparisonCallbacks {
@@ -254,43 +254,34 @@ class OverloadingConflictResolver(
             tryCompareDescriptorsFromScripts(f, g) ?:
             isNotLessSpecificCallableReferenceDescriptor(f, g)
 
-    companion object {
+    // Different smartcasts may lead to the same candidate descriptor wrapped into different ResolvedCallImpl objects
-        // Different smartcasts may lead to the same candidate descriptor wrapped into different ResolvedCallImpl objects
+    private fun <D : CallableDescriptor> uniquifyCandidatesSet(candidates: Collection<MutableResolvedCall<D>>): Set<MutableResolvedCall<D>> =
-        private fun <D : CallableDescriptor> uniquifyCandidatesSet(candidates: Collection<MutableResolvedCall<D>>): Set<MutableResolvedCall<D>> =
+            THashSet<MutableResolvedCall<D>>(candidates.size, getCallHashingStrategy<MutableResolvedCall<D>>()).apply { addAll(candidates) }
-                THashSet<MutableResolvedCall<D>>(candidates.size, getCallHashingStrategy<MutableResolvedCall<D>>()).apply { addAll(candidates) }
 
-        private fun <C> newResolvedCallSet(expectedSize: Int): MutableSet<C> =
+    private fun <C> newResolvedCallSet(expectedSize: Int): MutableSet<C> =
-                THashSet<C>(expectedSize, getCallHashingStrategy<C>())
+            THashSet<C>(expectedSize, getCallHashingStrategy<C>())
 
-        private object ResolvedCallHashingStrategy : TObjectHashingStrategy<ResolvedCall<*>> {
+    private object ResolvedCallHashingStrategy : TObjectHashingStrategy<ResolvedCall<*>> {
-            override fun equals(call1: ResolvedCall<*>?, call2: ResolvedCall<*>?): Boolean =
+        override fun equals(call1: ResolvedCall<*>?, call2: ResolvedCall<*>?): Boolean =
-                    if (call1 != null && call2 != null)
+                if (call1 != null && call2 != null)
-                        call1.resultingDescriptor == call2.resultingDescriptor
+                    call1.resultingDescriptor == call2.resultingDescriptor
-                    else
+                else
-                        call1 == call2
+                    call1 == call2
-
-            override fun computeHashCode(call: ResolvedCall<*>?): Int =
-                    call?.resultingDescriptor?.hashCode() ?: 0
-        }
-
-        private val MutableResolvedCall<*>.resultingVariableDescriptor: VariableDescriptor
-            get() = (this as VariableAsFunctionResolvedCall).variableCall.resultingDescriptor
-
-        @Suppress("UNCHECKED_CAST")
-        private fun <C> getCallHashingStrategy() =
-                ResolvedCallHashingStrategy as TObjectHashingStrategy<C>
 
+        override fun computeHashCode(call: ResolvedCall<*>?): Int =
+                call?.resultingDescriptor?.hashCode() ?: 0
     }
+
+    private val MutableResolvedCall<*>.resultingVariableDescriptor: VariableDescriptor
+        get() = (this as VariableAsFunctionResolvedCall).variableCall.resultingDescriptor
+
+    @Suppress("UNCHECKED_CAST")
+    private fun <C> getCallHashingStrategy() =
+            ResolvedCallHashingStrategy as TObjectHashingStrategy<C>
+
+    private fun <D : CallableDescriptor> FlatSignature<ResolvedCall<D>>.candidateDescriptor() =
+            origin.resultingDescriptor.original
+
+    private fun <D : CallableDescriptor> FlatSignature<ResolvedCall<D>>.descriptorVisibility() =
+            candidateDescriptor().visibility
 }
-
-internal fun <D : CallableDescriptor> FlatSignature<ResolvedCall<D>>.candidateDescriptor() =
-        origin.candidateDescriptor.original
-
-internal fun <D : CallableDescriptor> FlatSignature<ResolvedCall<D>>.callHandle() =
-        origin.call.toHandle()
-
-internal fun <D : CallableDescriptor> FlatSignature<ResolvedCall<D>>.descriptorVisibility() =
-        candidateDescriptor().visibility
-
-internal fun CallableDescriptor.varargParameterPosition() =
-        valueParameters.indexOfFirst { it.varargElementType != null }

core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -259,4 +259,8 @@ fun ClassDescriptor.getConstructorByParams(params: List<KotlinType>): Constructo
 
 // TODO: inline and remove as soon as all usage sies are converted to kotlin
 fun getConstructorByParamsMap(classDescriptor: ClassDescriptor, params: List<Pair<Name, KotlinType>>): ConstructorDescriptor? =
-        classDescriptor.getConstructorByParams(params.map { it.second })
+        classDescriptor.getConstructorByParams(params.map { it.second })
+
+
+fun CallableDescriptor.varargParameterPosition() =
+        valueParameters.indexOfFirst { it.varargElementType != null }