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

IR: rename IrElementVisitorVoid.visitVariableAccess -> visitValueAccess

Browse Source 
For consistency with IrElementVisitor.

Co-authored-by: mcpiroman <mcpiroman@gmail.com>
This commit is contained in:
Alexander Udalov
2022-02-16 01:36:40 +01:00
parent b00cd30e93
commit 8ccd4a40d2
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/ScopeValidator.kt
+2 -2
View File
@@ -41,7 +41,7 @@ class ScopeValidator(
} }
} }
fun visitVariableAccess(element: IrElement, variable: IrValueDeclaration) { fun visitValueAccess(element: IrElement, variable: IrValueDeclaration) {
if (variable !in this.values) { if (variable !in this.values) {
reportError(element, "Value ${variable.render()} not accessible") reportError(element, "Value ${variable.render()} not accessible")
} }
@@ -130,7 +130,7 @@ class ScopeValidator(
} }
override fun visitValueAccess(expression: IrValueAccessExpression, data: Visibles) { override fun visitValueAccess(expression: IrValueAccessExpression, data: Visibles) {
data.visitVariableAccess(expression, expression.symbol.owner) data.visitValueAccess(expression, expression.symbol.owner)
super.visitValueAccess(expression, data) super.visitValueAccess(expression, data)
} }
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/dce/UsefulDeclarationProcessor.kt
+7 -8
View File
@@ -8,12 +8,16 @@ package org.jetbrains.kotlin.ir.backend.js.dce
import org.jetbrains.kotlin.backend.common.ir.isMemberOfOpenClass import org.jetbrains.kotlin.backend.common.ir.isMemberOfOpenClass
import org.jetbrains.kotlin.ir.IrElement import org.jetbrains.kotlin.ir.IrElement
import org.jetbrains.kotlin.ir.backend.js.JsCommonBackendContext 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.declarations.*
import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.types.classifierOrNull 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 org.jetbrains.kotlin.ir.visitors.IrElementVisitor
import java.util.* import java.util.*
@@ -31,12 +35,7 @@ abstract class UsefulDeclarationProcessor(
protected abstract val bodyVisitor: BodyVisitorBase protected abstract val bodyVisitor: BodyVisitorBase
protected abstract inner class BodyVisitorBase : IrElementVisitor<Unit, IrDeclaration> { protected abstract inner class BodyVisitorBase : IrElementVisitor<Unit, IrDeclaration> {
override fun visitValueAccess(expression: IrValueAccessExpression, data: 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) {
visitDeclarationReference(expression, data) visitDeclarationReference(expression, data)
expression.symbol.owner.enqueue(data, "variable access") expression.symbol.owner.enqueue(data, "variable access")
} }
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/visitors/IrElementVisitorVoid.kt
+4 -4
View File
@@ -149,13 +149,13 @@ interface IrElementVisitorVoid : IrElementVisitor<Unit, Nothing?> {
fun visitGetEnumValue(expression: IrGetEnumValue) = visitSingletonReference(expression) fun visitGetEnumValue(expression: IrGetEnumValue) = visitSingletonReference(expression)
override fun visitGetEnumValue(expression: IrGetEnumValue, data: Nothing?) = visitGetEnumValue(expression) override fun visitGetEnumValue(expression: IrGetEnumValue, data: Nothing?) = visitGetEnumValue(expression)
fun visitVariableAccess(expression: IrValueAccessExpression) = visitDeclarationReference(expression) fun visitValueAccess(expression: IrValueAccessExpression) = visitDeclarationReference(expression)
override fun visitValueAccess(expression: IrValueAccessExpression, data: Nothing?) = visitVariableAccess(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) 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) override fun visitSetValue(expression: IrSetValue, data: Nothing?) = visitSetValue(expression)
fun visitFieldAccess(expression: IrFieldAccessExpression) = visitDeclarationReference(expression) fun visitFieldAccess(expression: IrFieldAccessExpression) = visitDeclarationReference(expression)