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

FIR: use type of last expression as type of branch, not type of block

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-18 18:15:17 +03:00
committed by Mikhail Glukhikh
parent fd279860f7
commit d89913dc8d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+6 -1
View File
@@ -529,7 +529,12 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
whenExpression.transformChildren(this, data) whenExpression.transformChildren(this, data)
if (whenExpression.resultType !is FirResolvedTypeRef) { if (whenExpression.resultType !is FirResolvedTypeRef) {
val type = commonSuperType(whenExpression.branches.mapNotNull { val type = commonSuperType(whenExpression.branches.mapNotNull {
it.result.resultType val expression = it.result.statements.lastOrNull() as? FirExpression
if (expression != null) {
(expression.resultType as? FirResolvedTypeRef) ?: FirErrorTypeRefImpl(session, null, "No type for when branch result")
} else {
FirImplicitUnitTypeRef(session, null)
}
}) })
if (type != null) whenExpression.resultType = type if (type != null) whenExpression.resultType = type
} }