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

Partially revert "[IR] Hide constructors of implementation classes behind factory functions"

Browse Source 
To restore binary compatibility with a compiler plugin used in
one of user projects.

#KT-66636 Fixed
This commit is contained in:
Wojciech Litewka
2024-03-18 11:02:04 +01:00
committed by Space Team
parent e007153ae6
commit 6af930fc0e
2 changed files with 14 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrCompositeImpl.kt
+11 -33
View File
@@ -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<IrStatement> = 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<IrStatement>,
) = 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<IrStatement>,
) : this(startOffset, endOffset, type, origin) {
this.statements.addAll(statements)
}
}
compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrReturnImpl.kt
+2 -20
View File
@@ -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,
)