From b00cd30e9324ea355afa5b6c04181c3d6005571f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 16 Feb 2022 00:01:38 +0100 Subject: [PATCH] IR: minor, move accept from IrConstantObjectImpl to IrConstantObject --- .../org/jetbrains/kotlin/ir/expressions/IrConstantObject.kt | 3 +++ .../kotlin/ir/expressions/impl/IrConstantObjectImpl.kt | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrConstantObject.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrConstantObject.kt index ab6351e6a00..ff5a60ef429 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrConstantObject.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrConstantObject.kt @@ -16,6 +16,9 @@ abstract class IrConstantObject : IrConstantValue() { abstract val valueArguments: MutableList abstract val typeArguments: List + override fun accept(visitor: IrElementVisitor, data: D): R = + visitor.visitConstantObject(this, data) + override fun acceptChildren(visitor: IrElementVisitor, data: D) { valueArguments.forEach { value -> value.accept(visitor, data) } } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstantObjectImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstantObjectImpl.kt index 9c3c317c6a8..212dc9903e4 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstantObjectImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrConstantObjectImpl.kt @@ -9,7 +9,6 @@ import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.symbols.IrConstructorSymbol import org.jetbrains.kotlin.ir.types.IrType import org.jetbrains.kotlin.ir.util.constructedClassType -import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.utils.SmartList class IrConstantPrimitiveImpl( @@ -45,10 +44,6 @@ class IrConstantObjectImpl constructor( ) : IrConstantObject() { override val valueArguments = SmartList(initArguments) - override fun accept(visitor: IrElementVisitor, data: D): R { - return visitor.visitConstantObject(this, data) - } - override fun contentEquals(other: IrConstantValue): Boolean = other is IrConstantObject && other.type == type &&