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

JVM_IR: keep offsets of const val reads when inlining them

Browse Source
This commit is contained in:
pyos
2019-11-29 11:32:52 +01:00
committed by Alexander Udalov
parent e4b1599457
commit 3e67ff097e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt
+6 -5
View File
@@ -13,10 +13,8 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
import org.jetbrains.kotlin.ir.declarations.IrField import org.jetbrains.kotlin.ir.declarations.IrField
import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.IrFile
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.IrConst import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrGetField
import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
import org.jetbrains.kotlin.ir.types.isPrimitiveType import org.jetbrains.kotlin.ir.types.isPrimitiveType
import org.jetbrains.kotlin.ir.types.isStringClassType import org.jetbrains.kotlin.ir.types.isStringClassType
@@ -43,13 +41,16 @@ fun IrField.constantValue(context: JvmBackendContext? = null): IrConst<*>? {
return if (implicitConst || correspondingPropertySymbol?.owner?.isConst == true) value else null return if (implicitConst || correspondingPropertySymbol?.owner?.isConst == true) value else null
} }
private fun <T> IrConst<T>.copyWithOffsets(startOffset: Int, endOffset: Int) =
IrConstImpl(startOffset, endOffset, type, kind, value)
class ConstLowering(val context: JvmBackendContext) : IrElementTransformerVoid(), FileLoweringPass { class ConstLowering(val context: JvmBackendContext) : IrElementTransformerVoid(), FileLoweringPass {
override fun lower(irFile: IrFile) = irFile.transformChildrenVoid() override fun lower(irFile: IrFile) = irFile.transformChildrenVoid()
private fun IrExpression.lowerConstRead(field: IrField?): IrExpression? { private fun IrExpression.lowerConstRead(field: IrField?): IrExpression? {
val value = field?.constantValue() ?: return null val value = field?.constantValue() ?: return null
return if (context.state.shouldInlineConstVals) return if (context.state.shouldInlineConstVals)
value.copy() value.copyWithOffsets(startOffset, endOffset)
else else
IrGetFieldImpl(startOffset, endOffset, field.symbol, field.type) IrGetFieldImpl(startOffset, endOffset, field.symbol, field.type)
} }
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/directives.txt
Vendored
-1
View File
@@ -1 +0,0 @@
// IGNORE_BACKEND: JVM_IR