JVM IR: Handle NonInlinedConst

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt

@@ -427,11 +427,13 @@ class ExpressionCodegen(
     override fun visitFieldAccess(expression: IrFieldAccessExpression, data: BlockInfo): PromisedValue {
         val callee = expression.symbol.owner
         callee.constantValue()?.let {
-            // Handling const reads before codegen is important for constant folding.
+            if (context.state.shouldInlineConstVals) {
-            assert(expression is IrSetField) { "read of const val ${callee.name} not inlined by ConstLowering" }
+                // Handling const reads before codegen is important for constant folding.
-            // This can only be the field's initializer; JVM implementations are required
+                assert(expression is IrSetField) { "read of const val ${callee.name} not inlined by ConstLowering" }
-            // to generate those for ConstantValue-marked fields automatically, so this is redundant.
+                // This can only be the field's initializer; JVM implementations are required
-            return defaultValue(expression.type)
+                // to generate those for ConstantValue-marked fields automatically, so this is redundant.
+                return defaultValue(expression.type)
+            }
         }
 
         val realField = callee.resolveFakeOverride()!!

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/ConstLowering.kt

@@ -5,9 +5,9 @@
 
 package org.jetbrains.kotlin.backend.jvm.lower
 
-import org.jetbrains.kotlin.backend.common.CommonBackendContext
 import org.jetbrains.kotlin.backend.common.FileLoweringPass
 import org.jetbrains.kotlin.backend.common.phaser.makeIrFilePhase
+import org.jetbrains.kotlin.backend.jvm.JvmBackendContext
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.declarations.IrField
 import org.jetbrains.kotlin.ir.declarations.IrFile
@@ -16,9 +16,8 @@ import org.jetbrains.kotlin.ir.expressions.IrCall
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrExpression
 import org.jetbrains.kotlin.ir.expressions.IrGetField
-import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols
+import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
 import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
-import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
 
 internal val constPhase = makeIrFilePhase(
     ::ConstLowering,
@@ -34,9 +33,17 @@ fun IrField.constantValue(implicitConst: Boolean = false): IrConst<*>? {
     return if (inline) (initializer?.expression as? IrConst<*>)?.copy() else null
 }
 
-class ConstLowering(val context: CommonBackendContext) : IrElementTransformerVoid(), FileLoweringPass {
+class ConstLowering(val context: JvmBackendContext) : IrElementTransformerVoid(), FileLoweringPass {
-    override fun lower(irFile: IrFile) {
+    override fun lower(irFile: IrFile) = irFile.transformChildrenVoid()
-        irFile.transformChildrenVoid(this)
+
+    private fun IrExpression.lowerConstRead(field: IrField?): IrExpression? {
+        val value = field?.constantValue()
+            ?: return null
+
+        return if (context.state.shouldInlineConstVals)
+            value
+        else
+            IrGetFieldImpl(startOffset, endOffset, field.symbol, field.type)
     }
 
     override fun visitCall(expression: IrCall): IrExpression {
@@ -44,9 +51,9 @@ class ConstLowering(val context: CommonBackendContext) : IrElementTransformerVoi
         val property = function.correspondingPropertySymbol?.owner ?: return super.visitCall(expression)
         if (function != property.getter)
             return super.visitCall(expression)
-        return property.backingField?.constantValue() ?: super.visitCall(expression)
+        return expression.lowerConstRead(property.backingField) ?: super.visitCall(expression)
     }
 
     override fun visitGetField(expression: IrGetField): IrExpression =
-        expression.symbol.owner.constantValue() ?: super.visitGetField(expression)
+        expression.lowerConstRead(expression.symbol.owner) ?: super.visitGetField(expression)
 }

compiler/testData/codegen/box/constants/kt9532_lv10.kt

@@ -1,5 +1,5 @@
 // !LANGUAGE: -InlineConstVals
-// IGNORE_BACKEND: JVM_IR, JS_IR, NATIVE
+// IGNORE_BACKEND: JS_IR, NATIVE
 // TODO: muted automatically, investigate should it be ran for JS or not
 // IGNORE_BACKEND: JS
 

compiler/testData/codegen/bytecodeText/constProperty/noInline.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: -InlineConstVals
-// IGNORE_BACKEND: JVM_IR
 
 const val z = 0
 

compiler/testData/codegen/bytecodeText/constProperty/noInlineInCmp.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: -InlineConstVals
-// IGNORE_BACKEND: JVM_IR
 
 const val z = 0
 

compiler/testData/codegen/bytecodeText/lazyCodegen/negateConstantCompare.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: -InlineConstVals
-// IGNORE_BACKEND: JVM_IR
 
 const val one = 1
 const val two = 2

compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt

@@ -1,5 +1,4 @@
 // !LANGUAGE: -InlineConstVals
-// IGNORE_BACKEND: JVM_IR
 
 const val y = "cde"