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

Drop toIrConst function with IrBuiltIns parameter

Browse Source
This commit is contained in:
Ivan Kylchik
2021-08-03 13:43:32 +03:00
committed by TeamCityServer
parent 7bddc2a815
commit b46a42be33
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/evaluate/IrConstTransformer.kt
+1 -1
View File
@@ -100,6 +100,6 @@ class IrConstTransformer(private val interpreter: IrInterpreter, private val irF
private fun IrExpression.convertToConstIfPossible(type: IrType): IrExpression { private fun IrExpression.convertToConstIfPossible(type: IrType): IrExpression {
if (this !is IrConst<*> || type is IrErrorType) return this if (this !is IrConst<*> || type is IrErrorType) return this
if (type.isArray()) return this.convertToConstIfPossible((type as IrSimpleType).arguments.single().typeOrNull!!) if (type.isArray()) return this.convertToConstIfPossible((type as IrSimpleType).arguments.single().typeOrNull!!)
return this.value.toIrConst(type, interpreter.irBuiltIns, this.startOffset, this.endOffset) return this.value.toIrConst(type, this.startOffset, this.endOffset)
} }
} }
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrTreeBuildUtils.kt
-9
View File
@@ -65,15 +65,6 @@ fun Any?.toIrConst(irType: IrType, startOffset: Int = SYNTHETIC_OFFSET, endOffse
toIrConstOrNull(irType, startOffset, endOffset) toIrConstOrNull(irType, startOffset, endOffset)
?: throw UnsupportedOperationException("Unsupported const element type ${irType.makeNotNull().render()}") ?: throw UnsupportedOperationException("Unsupported const element type ${irType.makeNotNull().render()}")
fun Any?.toIrConst(
irType: IrType, irBuiltIns: IrBuiltIns,
startOffset: Int = SYNTHETIC_OFFSET, endOffset: Int = SYNTHETIC_OFFSET
): IrConst<*> =
toIrConstOrNull(irType, startOffset, endOffset) ?: run {
if (irType == irBuiltIns.stringType) IrConstImpl.string(startOffset, endOffset, irType.makeNotNull(), this as String)
else throw UnsupportedOperationException("Unsupported const element type ${irType.makeNotNull().render()}")
}
internal fun State.toIrExpression(expression: IrExpression): IrExpression { internal fun State.toIrExpression(expression: IrExpression): IrExpression {
val start = expression.startOffset val start = expression.startOffset
val end = expression.endOffset val end = expression.endOffset