From 48f25385ac0e61d6a65fe0d3e11562d1b6eebfb9 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 24 Jun 2019 14:46:59 +0300 Subject: [PATCH] [NI] Don't use old common supertype calculator in NI --- .../kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt index f544704a5e6..e1cd0f4d445 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.TemporaryBindingTrace import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver +import org.jetbrains.kotlin.resolve.calls.NewCommonSuperTypeCalculator import org.jetbrains.kotlin.resolve.calls.checkers.CallCheckerContext import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.context.ContextDependency @@ -129,7 +130,7 @@ class ResolvedAtomCompleter( val substitutedTypes = returnTypes.filterNotNull() // we have some unsubstituted types if (substitutedTypes.isEmpty()) return false - val commonReturnType = CommonSupertypes.commonSupertype(substitutedTypes) + val commonReturnType = NewCommonSuperTypeCalculator.commonSuperType(substitutedTypes) return commonReturnType.isUnit() }