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

[FIR] Lambdas without contracts should be considered repeatable

Browse Source 
^KT-63777 Fixed
This commit is contained in:
Brian Norman
2024-01-02 11:58:22 -06:00
committed by Space Team
parent 8a3f850bca
commit 3346cc4b19
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt
+2 -2
View File
@@ -165,7 +165,7 @@ abstract class FirDataFlowAnalyzer(
} }
localFunctionNode?.mergeIncomingFlow() localFunctionNode?.mergeIncomingFlow()
functionEnterNode.mergeIncomingFlow { _, flow -> functionEnterNode.mergeIncomingFlow { _, flow ->
if (function is FirAnonymousFunction && function.invocationKind?.canBeRevisited() == true) { if (function is FirAnonymousFunction && function.invocationKind?.canBeRevisited() != false) {
enterRepeatableStatement(flow, function) enterRepeatableStatement(flow, function)
} }
} }
@@ -176,7 +176,7 @@ abstract class FirDataFlowAnalyzer(
if (function is FirDefaultPropertyAccessor) return null if (function is FirDefaultPropertyAccessor) return null
context.variableAssignmentAnalyzer.exitFunction() context.variableAssignmentAnalyzer.exitFunction()
if (function is FirAnonymousFunction && function.invocationKind?.canBeRevisited() == true) { if (function is FirAnonymousFunction && function.invocationKind?.canBeRevisited() != false) {
exitRepeatableStatement(function) exitRepeatableStatement(function)
} }
compiler/testData/diagnostics/tests/smartCasts/lambdasWithContracts/lambdaWithCallInPlace.fir.kt
Vendored
+5 -5
View File
@@ -27,7 +27,7 @@ fun test1() {
var x: Any? = materialize() var x: Any? = materialize()
require(x is String) require(x is String)
runWithoutContract { runWithoutContract {
<!SMARTCAST_IMPOSSIBLE!>x<!>.length x.<!UNRESOLVED_REFERENCE!>length<!>
x = 10 x = 10
} }
} }
@@ -81,9 +81,9 @@ fun test7() {
var x: Any? = materialize() var x: Any? = materialize()
require(x is String) require(x is String)
runWithoutContract { runWithoutContract {
<!SMARTCAST_IMPOSSIBLE!>x<!>.length x.<!UNRESOLVED_REFERENCE!>length<!>
runWithoutContract { runWithoutContract {
<!SMARTCAST_IMPOSSIBLE!>x<!>.length x.<!UNRESOLVED_REFERENCE!>length<!>
} }
x = 10 x = 10
} }
@@ -498,7 +498,7 @@ fun test51() {
var x: Any = materialize() var x: Any = materialize()
while (x is String) { while (x is String) {
runWithoutContract { runWithoutContract {
<!SMARTCAST_IMPOSSIBLE!>x<!>.length x.<!UNRESOLVED_REFERENCE!>length<!>
x = 10 x = 10
} }
} }
@@ -569,7 +569,7 @@ fun test58() {
for (i in 1..3) { for (i in 1..3) {
require(x is String) require(x is String)
runWithoutContract { runWithoutContract {
<!SMARTCAST_IMPOSSIBLE!>x<!>.length x.<!UNRESOLVED_REFERENCE!>length<!>
x = 10 x = 10
} }
} }
compiler/testData/diagnostics/tests/smartCasts/lambdasWithContracts/lambdaWithCallInPlaceAndBounds.fir.kt
Vendored
+1 -1
View File
@@ -370,7 +370,7 @@ fun test33() {
var y = x var y = x
runWithoutContract { runWithoutContract {
while (x is String) { while (x is String) {
y.length y.<!UNRESOLVED_REFERENCE!>length<!>
<!SMARTCAST_IMPOSSIBLE!>x<!>.length <!SMARTCAST_IMPOSSIBLE!>x<!>.length
} }
x = 10 x = 10
compiler/testData/diagnostics/tests/smartCasts/varnotnull/capturedInClosureModifiedBefore.fir.kt
Vendored
+2 -2
View File
@@ -30,7 +30,7 @@ fun baz(s: String?) {
<!SMARTCAST_IMPOSSIBLE!>x<!>.hashCode() <!SMARTCAST_IMPOSSIBLE!>x<!>.hashCode()
} }
run { run {
<!SMARTCAST_IMPOSSIBLE!>x<!>.hashCode() x<!UNSAFE_CALL!>.<!>hashCode()
x = null x = null
} }
} }
@@ -40,7 +40,7 @@ fun gaz(s: String?) {
var x = s var x = s
if (x != null) { if (x != null) {
run { run {
<!SMARTCAST_IMPOSSIBLE!>x<!>.hashCode() x<!UNSAFE_CALL!>.<!>hashCode()
x = null x = null
} }
run { run {