From 35c754c27cd0d75dee0952861728136228179b4a Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 27 Apr 2021 13:50:00 +0300 Subject: [PATCH] FIR-DFA: Ignore FinallyBlockExitNode when computing return arguments --- .../kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2f94234470..fea7e1485cc 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 @@ -133,7 +133,7 @@ class ControlFlowGraphBuilder { } fun CFGNode<*>.extractArgument(): FirElement? = when (this) { - is FunctionEnterNode, is TryMainBlockEnterNode, is CatchClauseEnterNode -> null + is FunctionEnterNode, is TryMainBlockEnterNode, is FinallyBlockExitNode, is CatchClauseEnterNode -> null is StubNode, is BlockExitNode -> firstPreviousNode.extractArgument() else -> fir.extractArgument() }