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

FIR: do not force coercion-to-Unit for nullable lambda return type

Browse Source 
3d7d87ac should have been implemented as aafe41c did.
This commit is contained in:
Jinseong Jeon
2020-12-14 10:27:05 -08:00
committed by Dmitriy Novozhilov
parent 6239301f4e
commit efeabac2c5
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/PostponedArgumentsAnalyzer.kt
+1 -2
View File
@@ -116,8 +116,7 @@ class PostponedArgumentsAnalyzer(
c.canBeProper(rawReturnType) -> substitute(rawReturnType) c.canBeProper(rawReturnType) -> substitute(rawReturnType)
// For Unit-coercion // For Unit-coercion
c.hasUpperOrEqualUnitConstraint(rawReturnType) -> !rawReturnType.isMarkedNullable && c.hasUpperOrEqualUnitConstraint(rawReturnType) -> unitType
if (rawReturnType.isMarkedNullable) unitType.withNullability(ConeNullability.NULLABLE) else unitType
else -> null else -> null
} }