, S : internal val infoAtNormalPath: S get() = map.getValue(NormalPath) - private val hasNormalPath: Boolean - get() = map.containsKey(NormalPath) - fun applyLabel(node: CFGNode<*>, label: EdgeLabel): P { if (label.isNormal) { // Special case: when we exit the try expression, null label means a normal path. @@ -26,7 +23,8 @@ abstract class PathAwareControlFlowInfo
, S : // One day, if we allow multiple edges between nodes with different labels, e.g., labeling all paths in try/catch/finally, // instead of this kind of special handling, proxy enter/exit nodes per label are preferred. if (node is TryExpressionExitNode) { - return if (hasNormalPath) { + val infoAtNormalPath = map[NormalPath] + return if (infoAtNormalPath != null) { constructor(persistentMapOf(NormalPath to infoAtNormalPath)) } else { /* This means no info for normal path. */ diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt index f8dd4a3db54..2f8760b2d55 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt @@ -640,10 +640,10 @@ class ControlFlowGraphBuilder { else -> throw IllegalArgumentException("Unknown jump type: ${jump.render()}") } - val labelForFinallyBLock = if (jump is FirReturnExpression) { - ReturnPath(jump.target.labeledElement.symbol) - } else { - NormalPath + val labelForFinallyBLock = when (jump) { + is FirReturnExpression -> ReturnPath(jump.target.labeledElement.symbol) + is FirLoopJump -> LoopPath(jump) + else -> NormalPath } addNodeWithJump( diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt index fb7588648d6..ef2c8865828 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraph.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.fir.resolve.dfa.cfg import org.jetbrains.kotlin.fir.declarations.FirDeclaration +import org.jetbrains.kotlin.fir.expressions.FirBreakExpression +import org.jetbrains.kotlin.fir.expressions.FirLoopJump import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol class ControlFlowGraph(val declaration: FirDeclaration?, val name: String, val kind: Kind) { @@ -144,6 +146,11 @@ object LoopBackPath : EdgeLabel(label = null) { object UncaughtExceptionPath : EdgeLabel(label = "onUncaughtException") +class LoopPath( + firLoopJump: FirLoopJump +) : EdgeLabel("\"" + (if (firLoopJump is FirBreakExpression) "break" else "continue") + + (firLoopJump.target.labeledElement.label?.let { "@${it.name}" } ?: "") + "\"") + // TODO: Label `return`ing edge with this. class ReturnPath( returnTargetSymbol: FirFunctionSymbol<*> diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.kt new file mode 100644 index 00000000000..b2d5153168a --- /dev/null +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.kt @@ -0,0 +1,24 @@ +// FIR_IDENTICAL +// ISSUE: KT-51759 + +fun testBreak(b: Boolean, s: String?) { + while (b) { + val x: String? + try { + x = s ?: break + } finally { + } + x!!.length + } +} + +fun testContinue(b: Boolean, s: String?) { + while (b) { + val x: String? + try { + x = s ?: continue + } finally { + } + x!!.length + } +} diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.txt new file mode 100644 index 00000000000..b09e576c2ec --- /dev/null +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.txt @@ -0,0 +1,4 @@ +package + +public fun testBreak(/*0*/ b: kotlin.Boolean, /*1*/ s: kotlin.String?): kotlin.Unit +public fun testContinue(/*0*/ b: kotlin.Boolean, /*1*/ s: kotlin.String?): kotlin.Unit diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java index fecdb9a9a23..19e6abe616b 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java @@ -5440,6 +5440,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest { runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinally.kt"); } + @Test + @TestMetadata("breakContinueInTryFinallyInLoop.kt") + public void testBreakContinueInTryFinallyInLoop() throws Exception { + runTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakContinueInTryFinallyInLoop.kt"); + } + @Test @TestMetadata("breakInsideLocal.kt") public void testBreakInsideLocal() throws Exception {