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

[FIR] Unwrap named arguments during contracts verification

Browse Source 
^KT-64501 Fixed
This commit is contained in:
Dmitriy Novozhilov
2023-12-21 12:58:31 +02:00
committed by Space Team
parent 6031f80e01
commit de9826683e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/testData/resolveWithStdlib/contracts/fromSource/good/callsInPlace/namedArgument.kt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ inline fun myRun(f: () -> Unit) {
@OptIn(ExperimentalContracts::class)
inline fun test_1(g: () -> Unit) {
<!WRONG_INVOCATION_KIND!>contract { callsInPlace(g, InvocationKind.EXACTLY_ONCE) }<!>
contract { callsInPlace(g, InvocationKind.EXACTLY_ONCE) }
myRun(f = g)
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/cfa/FirCallsEffectAnalyzer.kt
+5 -2
View File
@@ -200,7 +200,8 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() {
}
for (arg in node.fir.argumentList.arguments) {
data.checkExpressionForLeakedSymbols(arg) {
val unwrappedArg = arg.unwrapArgument()
data.checkExpressionForLeakedSymbols(unwrappedArg) {
node.fir.getArgumentCallsEffect(arg) == null
}
}
@@ -307,7 +308,9 @@ object FirCallsEffectAnalyzer : FirControlFlowChecker() {
return this is FirAnonymousFunction && this.isLambda && this.invocationKind != null
}
private fun FirExpression?.toQualifiedReference(): FirReference? = (this as? FirQualifiedAccessExpression)?.calleeReference
private fun FirExpression?.toQualifiedReference(): FirReference? {
return (this?.unwrapArgument() as? FirQualifiedAccessExpression)?.calleeReference
}
private fun referenceToSymbol(reference: FirReference?): FirBasedSymbol<*>? = when (reference) {
is FirResolvedNamedReference -> reference.resolvedSymbol