diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt index 4ac3d4ab9e6..bb9322c8ccb 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt @@ -10,47 +10,25 @@ import org.jetbrains.kotlin.ir.declarations.IrAttributeContainer import org.jetbrains.kotlin.ir.expressions.IrComposite import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin import org.jetbrains.kotlin.ir.types.IrType -import org.jetbrains.kotlin.ir.util.IrElementConstructorIndicator -class IrCompositeImpl internal constructor( - @Suppress("UNUSED_PARAMETER") - constructorIndicator: IrElementConstructorIndicator?, +class IrCompositeImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, - override var origin: IrStatementOrigin?, + override var origin: IrStatementOrigin? = null, ) : IrComposite() { override val statements: MutableList = ArrayList(2) override var attributeOwnerId: IrAttributeContainer = this override var originalBeforeInline: IrAttributeContainer? = null -} -fun IrCompositeImpl( - startOffset: Int, - endOffset: Int, - type: IrType, - origin: IrStatementOrigin? = null, -) = IrCompositeImpl( - constructorIndicator = null, - startOffset = startOffset, - endOffset = endOffset, - type = type, - origin = origin, -) - -fun IrCompositeImpl( - startOffset: Int, - endOffset: Int, - type: IrType, - origin: IrStatementOrigin?, - statements: List, -) = IrCompositeImpl( - constructorIndicator = null, - startOffset = startOffset, - endOffset = endOffset, - type = type, - origin = origin, -).apply { - this.statements.addAll(statements) + constructor( + startOffset: Int, + endOffset: Int, + type: IrType, + origin: IrStatementOrigin?, + statements: List, + ) : this(startOffset, endOffset, type, origin) { + this.statements.addAll(statements) + } } diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt index bd4ddfa0852..57263c8725c 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt @@ -10,32 +10,14 @@ import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.expressions.IrReturn import org.jetbrains.kotlin.ir.symbols.IrReturnTargetSymbol import org.jetbrains.kotlin.ir.types.IrType -import org.jetbrains.kotlin.ir.util.IrElementConstructorIndicator -class IrReturnImpl internal constructor( - @Suppress("UNUSED_PARAMETER") - constructorIndicator: IrElementConstructorIndicator?, +class IrReturnImpl( override val startOffset: Int, override val endOffset: Int, override var type: IrType, override var returnTargetSymbol: IrReturnTargetSymbol, - override var value: IrExpression, + override var value: IrExpression ) : IrReturn() { override var attributeOwnerId: IrAttributeContainer = this override var originalBeforeInline: IrAttributeContainer? = null -} - -fun IrReturnImpl( - startOffset: Int, - endOffset: Int, - type: IrType, - returnTargetSymbol: IrReturnTargetSymbol, - value: IrExpression, -) = IrReturnImpl( - constructorIndicator = null, - startOffset = startOffset, - endOffset = endOffset, - type = type, - returnTargetSymbol = returnTargetSymbol, - value = value, -) +} \ No newline at end of file