From 8ccd4a40d2976276a7c7c471a26c8febf1b90b46 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 16 Feb 2022 01:36:40 +0100
Subject: [PATCH] IR: rename IrElementVisitorVoid.visitVariableAccess ->
 visitValueAccess

For consistency with IrElementVisitor.

Co-authored-by: mcpiroman <mcpiroman@gmail.com>
---
 .../kotlin/backend/common/ScopeValidator.kt       |  4 ++--
 .../backend/js/dce/UsefulDeclarationProcessor.kt  | 15 +++++++--------
 .../kotlin/ir/visitors/IrElementVisitorVoid.kt    |  8 ++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ScopeValidator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ScopeValidator.kt
index 1d4fd3d6464..479e08ecdcd 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ScopeValidator.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ScopeValidator.kt
@@ -41,7 +41,7 @@ class ScopeValidator(
             }
         }
 
-        fun visitVariableAccess(element: IrElement, variable: IrValueDeclaration) {
+        fun visitValueAccess(element: IrElement, variable: IrValueDeclaration) {
             if (variable !in this.values) {
                 reportError(element, "Value ${variable.render()} not accessible")
             }
@@ -130,7 +130,7 @@ class ScopeValidator(
         }
 
         override fun visitValueAccess(expression: IrValueAccessExpression, data: Visibles) {
-            data.visitVariableAccess(expression, expression.symbol.owner)
+            data.visitValueAccess(expression, expression.symbol.owner)
             super.visitValueAccess(expression, data)
         }
 
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt
index b9a88896753..cd060157fca 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt
@@ -8,12 +8,16 @@ package org.jetbrains.kotlin.ir.backend.js.dce
 import org.jetbrains.kotlin.backend.common.ir.isMemberOfOpenClass
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext
-import org.jetbrains.kotlin.ir.backend.js.utils.*
+import org.jetbrains.kotlin.ir.backend.js.utils.hasJsPolyfill
+import org.jetbrains.kotlin.ir.backend.js.utils.isAssociatedObjectAnnotatedAnnotation
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.*
 import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
 import org.jetbrains.kotlin.ir.types.classifierOrNull
-import org.jetbrains.kotlin.ir.util.*
+import org.jetbrains.kotlin.ir.util.constructedClass
+import org.jetbrains.kotlin.ir.util.fqNameWhenAvailable
+import org.jetbrains.kotlin.ir.util.isObject
+import org.jetbrains.kotlin.ir.util.resolveFakeOverride
 import org.jetbrains.kotlin.ir.visitors.IrElementVisitor
 import java.util.*
 
@@ -31,12 +35,7 @@ abstract class UsefulDeclarationProcessor(
     protected abstract val bodyVisitor: BodyVisitorBase
 
     protected abstract inner class BodyVisitorBase : IrElementVisitor<Unit, IrDeclaration> {
-
-        override fun visitValueAccess(expression: IrValueAccessExpression, data: IrDeclaration) = visitVariableAccess(expression, data)
-        override fun visitGetValue(expression: IrGetValue, data: IrDeclaration) = visitVariableAccess(expression, data)
-        override fun visitSetValue(expression: IrSetValue, data: IrDeclaration) = visitVariableAccess(expression, data)
-
-        private fun visitVariableAccess(expression: IrValueAccessExpression, data: IrDeclaration) {
+        override fun visitValueAccess(expression: IrValueAccessExpression, data: IrDeclaration) {
             visitDeclarationReference(expression, data)
             expression.symbol.owner.enqueue(data, "variable access")
         }
diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt
index 67cfc0efc8e..2edb4d4ccbf 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt
@@ -149,13 +149,13 @@ interface IrElementVisitorVoid : IrElementVisitor<Unit, Nothing?> {
     fun visitGetEnumValue(expression: IrGetEnumValue) = visitSingletonReference(expression)
     override fun visitGetEnumValue(expression: IrGetEnumValue, data: Nothing?) = visitGetEnumValue(expression)
 
-    fun visitVariableAccess(expression: IrValueAccessExpression) = visitDeclarationReference(expression)
-    override fun visitValueAccess(expression: IrValueAccessExpression, data: Nothing?) = visitVariableAccess(expression)
+    fun visitValueAccess(expression: IrValueAccessExpression) = visitDeclarationReference(expression)
+    override fun visitValueAccess(expression: IrValueAccessExpression, data: Nothing?) = visitValueAccess(expression)
 
-    fun visitGetValue(expression: IrGetValue) = visitVariableAccess(expression)
+    fun visitGetValue(expression: IrGetValue) = visitValueAccess(expression)
     override fun visitGetValue(expression: IrGetValue, data: Nothing?) = visitGetValue(expression)
 
-    fun visitSetValue(expression: IrSetValue) = visitVariableAccess(expression)
+    fun visitSetValue(expression: IrSetValue) = visitValueAccess(expression)
     override fun visitSetValue(expression: IrSetValue, data: Nothing?) = visitSetValue(expression)
 
     fun visitFieldAccess(expression: IrFieldAccessExpression) = visitDeclarationReference(expression)