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

NI. Fix call commonSuperType for 0 types (bug introduced in cbf1d773)

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-03-07 17:40:51 +03:00
parent 4f532a7c05
commit b681e4bda3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ResolvedAtomCompleter.kt
+6 -2
View File
@@ -110,14 +110,18 @@ class ResolvedAtomCompleter(
private val ResolvedLambdaAtom.isCoercedToUnit: Boolean private val ResolvedLambdaAtom.isCoercedToUnit: Boolean
get() { get() {
val returnTypes = val returnTypes =
resultArguments.mapNotNull { resultArguments.map {
val type = it.safeAs<SimpleKotlinCallArgument>()?.receiver?.receiverValue?.type ?: return@mapNotNull null val type = it.safeAs<SimpleKotlinCallArgument>()?.receiver?.receiverValue?.type ?: return@map null
val unwrappedType = when (type) { val unwrappedType = when (type) {
is WrappedType -> type.unwrap() is WrappedType -> type.unwrap()
is UnwrappedType -> type is UnwrappedType -> type
} }
resultSubstitutor.safeSubstitute(unwrappedType) resultSubstitutor.safeSubstitute(unwrappedType)
} }
if (returnTypes.isEmpty()) return true
val substitutedTypes = returnTypes.filterNotNull()
// we have some unsubstituted types
if (substitutedTypes.isEmpty()) return false
val commonReturnType = CommonSupertypes.commonSupertype(returnTypes) val commonReturnType = CommonSupertypes.commonSupertype(returnTypes)
return commonReturnType.isUnit() return commonReturnType.isUnit()
} }