azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[NI] Don't use old common supertype calculator in NI

Browse Source
This commit is contained in:
Mikhail Zarechenskiy
2019-06-24 14:46:59 +03:00
parent 60a0cf1fcc
commit 48f25385ac
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.TemporaryBindingTrace import org.jetbrains.kotlin.resolve.TemporaryBindingTrace
import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver 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.checkers.CallCheckerContext
import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext
import org.jetbrains.kotlin.resolve.calls.context.ContextDependency import org.jetbrains.kotlin.resolve.calls.context.ContextDependency
@@ -129,7 +130,7 @@ class ResolvedAtomCompleter(
val substitutedTypes = returnTypes.filterNotNull() val substitutedTypes = returnTypes.filterNotNull()
// we have some unsubstituted types // we have some unsubstituted types
if (substitutedTypes.isEmpty()) return false if (substitutedTypes.isEmpty()) return false
val commonReturnType = CommonSupertypes.commonSupertype(substitutedTypes) val commonReturnType = NewCommonSuperTypeCalculator.commonSuperType(substitutedTypes)
return commonReturnType.isUnit() return commonReturnType.isUnit()
} }