From 3f4d2e93c64e50f0f0b28c7557974699abb33dbb Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Fri, 12 Jan 2024 18:49:36 +0100 Subject: [PATCH] K2. Minor. Rename CFG ConstExpressionNode to LiteralExpressionNode ^KT-64314 --- .../jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt | 6 +++--- .../kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt | 4 ++-- .../fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt | 4 ++-- .../body/resolve/FirExpressionsResolveTransformer.kt | 2 +- .../src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt | 4 ++-- .../jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt | 2 +- .../kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt | 2 +- .../fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt index 8a5a765ae5d..10d0e96f0a1 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt @@ -1020,9 +1020,9 @@ abstract class FirDataFlowAnalyzer( } } - fun exitConstExpression(constExpression: FirLiteralExpression<*>) { - if (constExpression.isResolved) return - graphBuilder.exitConstExpression(constExpression).mergeIncomingFlow() + fun exitLiteralExpression(literalExpression: FirLiteralExpression<*>) { + if (literalExpression.isResolved) return + graphBuilder.exitLiteralExpression(literalExpression).mergeIncomingFlow() } fun exitLocalVariableDeclaration(variable: FirProperty, hadExplicitType: Boolean) { 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 6fa52ab6149..a773056f5e4 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 @@ -1330,8 +1330,8 @@ class ControlFlowGraphBuilder { return node } - fun exitLiteralExpression(constExpression: FirLiteralExpression<*>): ConstExpressionNode { - return createConstExpressionNode(constExpression).also { addNewSimpleNode(it) } + fun exitLiteralExpression(literalExpression: FirLiteralExpression<*>): LiteralExpressionNode { + return createLiteralExpressionNode(literalExpression).also { addNewSimpleNode(it) } } fun exitVariableDeclaration(variable: FirProperty): VariableDeclarationNode { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt index 0853410183c..284c9b7f8b9 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt @@ -163,8 +163,8 @@ fun ControlFlowGraphBuilder.createElvisExitNode(fir: FirElvisExpression): ElvisE fun ControlFlowGraphBuilder.createVariableDeclarationNode(fir: FirProperty): VariableDeclarationNode = VariableDeclarationNode(currentGraph, fir, levelCounter) -fun ControlFlowGraphBuilder.createConstExpressionNode(fir: FirLiteralExpression<*>): ConstExpressionNode = - ConstExpressionNode(currentGraph, fir, levelCounter) +fun ControlFlowGraphBuilder.createLiteralExpressionNode(fir: FirLiteralExpression<*>): LiteralExpressionNode = + LiteralExpressionNode(currentGraph, fir, levelCounter) fun ControlFlowGraphBuilder.createThrowExceptionNode(fir: FirThrowExpression): ThrowExceptionNode = ThrowExceptionNode(currentGraph, fir, levelCounter) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt index 687731a6ec5..4ee67c3ac88 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt @@ -1205,7 +1205,7 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT else -> kind.expectedConeType(session) } - dataFlowAnalyzer.exitConstExpression(literalExpression as FirLiteralExpression<*>) + dataFlowAnalyzer.exitLiteralExpression(literalExpression as FirLiteralExpression<*>) literalExpression.resultType = type return when (val resolvedType = literalExpression.resolvedType) { diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt index 26e13dcfe18..8e0ee6b132f 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt @@ -668,9 +668,9 @@ class JumpNode(owner: ControlFlowGraph, override val fir: FirJump<*>, level: Int return visitor.visitJumpNode(this, data) } } -class ConstExpressionNode(owner: ControlFlowGraph, override val fir: FirLiteralExpression<*>, level: Int) : CFGNode>(owner, level) { +class LiteralExpressionNode(owner: ControlFlowGraph, override val fir: FirLiteralExpression<*>, level: Int) : CFGNode>(owner, level) { override fun accept(visitor: ControlFlowGraphVisitor, data: D): R { - return visitor.visitConstExpressionNode(this, data) + return visitor.visitLiteralExpressionNode(this, data) } } diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt index 63342eda9c3..df855690854 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNodeRenderer.kt @@ -50,7 +50,7 @@ fun CFGNode<*>.render(): String = is StubNode -> "Stub" is CheckNotNullCallNode -> "Check not null: ${CfgRenderer.renderElementAsString(fir)}" - is ConstExpressionNode -> "Const: ${fir.render()}" + is LiteralExpressionNode -> "Const: ${fir.render()}" is VariableDeclarationNode -> "Variable declaration: ${ CfgRenderer.renderAsCallableDeclarationString(fir) diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt index 6e14a763ef5..c52d92c591f 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitor.kt @@ -299,7 +299,7 @@ abstract class ControlFlowGraphVisitor { return visitNode(node, data) } - open fun visitConstExpressionNode(node: ConstExpressionNode, data: D): R { + open fun visitLiteralExpressionNode(node: LiteralExpressionNode, data: D): R { return visitNode(node, data) } diff --git a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt index f44206617a7..73b04631555 100644 --- a/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt +++ b/compiler/fir/semantics/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphVisitorVoid.kt @@ -219,7 +219,7 @@ abstract class ControlFlowGraphVisitorVoid : ControlFlowGraphVisitor