diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrBlock.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrBlock.kt index 66bc4a62504..294a78e0cc1 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrBlock.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrBlock.kt @@ -15,9 +15,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * @sample org.jetbrains.kotlin.ir.generator.IrTree.block */ abstract class IrBlock : IrContainerExpression() { - override val isTransparentScope: Boolean - get() = false - override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitBlock(this, data) } diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrComposite.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrComposite.kt index 2b2e22ee5ac..1121d3d75b2 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrComposite.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrComposite.kt @@ -15,9 +15,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor * @sample org.jetbrains.kotlin.ir.generator.IrTree.composite */ abstract class IrComposite : IrContainerExpression() { - override val isTransparentScope: Boolean - get() = true - override fun accept(visitor: IrElementVisitor, data: D): R = visitor.visitComposite(this, data) } diff --git a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrContainerExpression.kt b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrContainerExpression.kt index 59f91e382d0..55730444400 100644 --- a/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrContainerExpression.kt +++ b/compiler/ir/ir.tree/gen/org/jetbrains/kotlin/ir/expressions/IrContainerExpression.kt @@ -20,8 +20,6 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor abstract class IrContainerExpression : IrExpression(), IrStatementContainer { abstract val origin: IrStatementOrigin? - abstract val isTransparentScope: Boolean - override val statements: MutableList = ArrayList(2) override fun acceptChildren(visitor: IrElementVisitor, data: D) { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpressions.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpressions.kt index 111824b644b..3f187ec1df7 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpressions.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/IrExpressions.kt @@ -48,3 +48,6 @@ fun IrVararg.addElement(varargElement: IrVarargElement) { fun IrStringConcatenation.addArgument(argument: IrExpression) { arguments.add(argument) } + +val IrContainerExpression.isTransparentScope: Boolean + get() = this is IrComposite diff --git a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt index 6b2f90c2dec..f9938ffed1e 100644 --- a/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt +++ b/compiler/ir/ir.tree/tree-generator/src/org/jetbrains/kotlin/ir/generator/IrTree.kt @@ -618,7 +618,6 @@ object IrTree : AbstractTreeBuilder() { parent(statementContainer) +field("origin", statementOriginType, nullable = true) - +field("isTransparentScope", boolean) +listField("statements", statement, mutability = List, isChild = true) { generationCallback = { addModifiers(KModifier.OVERRIDE) @@ -631,19 +630,11 @@ object IrTree : AbstractTreeBuilder() { accept = true parent(containerExpression) - - +field("isTransparentScope", boolean) { - baseGetter = code("false") - } } val composite: ElementConfig by element(Expression) { visitorParent = containerExpression parent(containerExpression) - - +field("isTransparentScope", boolean) { - baseGetter = code("true") - } } val returnableBlock: ElementConfig by element(Expression) { parent(block)