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

[FIR] Fix missing RETURN_TYPE_MISMATCH for labeled return statements

Browse Source 
in lambda functions, ^KT-59907 Fixed
This commit is contained in:
Ivan Kochurkin
2023-09-19 13:58:31 +02:00
committed by Space Team
parent 2e4d486131
commit 8e72f60996
9 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/diagnostics/functionReturnTypeMismatchChecker/basic.kt
Vendored
+1 -1
View File
@@ -37,7 +37,7 @@ fun errorWithLambda(): String {
return@foo
} foo {
bar()
return@foo <!ARGUMENT_TYPE_MISMATCH!>10<!>
return@foo <!ARGUMENT_TYPE_MISMATCH, RETURN_TYPE_MISMATCH!>10<!>
}
return ""
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirFunctionReturnTypeMismatchChecker.kt
+27 -6
View File
@@ -9,20 +9,19 @@ import org.jetbrains.kotlin.KtFakeSourceElementKind
import org.jetbrains.kotlin.KtRealSourceElementKind
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.cfa.util.previousCfgNodes
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.hasExplicitReturnType
import org.jetbrains.kotlin.fir.analysis.checkers.isSubtypeForTypeMismatch
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NULL_FOR_NONNULL_TYPE
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.RETURN_TYPE_MISMATCH
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.SMARTCAST_IMPOSSIBLE
import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction
import org.jetbrains.kotlin.fir.declarations.FirConstructor
import org.jetbrains.kotlin.fir.declarations.FirErrorFunction
import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.expressions.FirReturnExpression
import org.jetbrains.kotlin.fir.expressions.FirSmartCastExpression
import org.jetbrains.kotlin.fir.expressions.FirWhenExpression
import org.jetbrains.kotlin.fir.expressions.isExhaustive
import org.jetbrains.kotlin.fir.resolve.dfa.controlFlowGraph
import org.jetbrains.kotlin.fir.types.*
object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
@@ -31,7 +30,7 @@ object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
if (expression.source?.kind == KtFakeSourceElementKind.DelegatedPropertyAccessor) return
val targetElement = expression.target.labeledElement
if (targetElement is FirErrorFunction || targetElement is FirAnonymousFunction && targetElement.isLambda) {
if (targetElement is FirErrorFunction) {
return
}
@@ -91,7 +90,21 @@ object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
)
}
}
} else if (resultExpression.source?.kind is KtFakeSourceElementKind.ImplicitUnit && !functionReturnType.isUnit) {
} else if (resultExpression.source?.kind is KtFakeSourceElementKind.ImplicitUnit &&
!functionReturnType.isUnit &&
shouldCheckMismatchForAnonymousFunction(targetElement, expression)
) {
// Disallow cases like
// fun foo(): Any { return }
// Allow cases like
// fun foo(): Unit { return }
// fun foo() { return Unit }
// But ignore anonymous functions without explicit returns, the following code is valid (where type of parameter R is being inferenced):
// run {
// if (flag) return@run
// "str"
// }
// If type parameter is specified explicitly, checking is performed in the branch above and RETURN_TYPE_MISMATCH is reported
reporter.reportOn(
resultExpression.source,
RETURN_TYPE_MISMATCH,
@@ -103,4 +116,12 @@ object FirFunctionReturnTypeMismatchChecker : FirReturnExpressionChecker() {
)
}
}
private fun shouldCheckMismatchForAnonymousFunction(targetElement: FirFunction, expression: FirReturnExpression): Boolean {
if (targetElement !is FirAnonymousFunction || !targetElement.isLambda) return true
val cfgNodes = targetElement.controlFlowGraphReference?.controlFlowGraph?.exitNode?.previousCfgNodes ?: return true
// Check if any return expression other than the current is explicit
return cfgNodes.any { if (it.fir === expression) false else it.fir is FirReturnExpression }
}
}