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

JVM_IR don't evaluate static receiver if it's a variable

Browse Source
This commit is contained in:
Dmitry Petrov
2021-08-19 14:23:12 +03:00
committed by TeamCityServer
parent 041773fd25
commit a4e299b8e1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/JvmOptimizationLowering.kt
+2 -2
View File
@@ -214,11 +214,11 @@ class JvmOptimizationLowering(val context: JvmBackendContext) : FileLoweringPass
val backingField = property.backingField!! val backingField = property.backingField!!
val receiver = expression.dispatchReceiver val receiver = expression.dispatchReceiver
return context.createIrBuilder(expression.symbol, expression.startOffset, expression.endOffset).irBlock(expression) { return context.createIrBuilder(expression.symbol, expression.startOffset, expression.endOffset).irBlock(expression) {
if (backingField.isStatic && receiver != null) { if (backingField.isStatic && receiver != null && receiver !is IrGetValue) {
// If the field is static, evaluate the receiver for potential side effects. // If the field is static, evaluate the receiver for potential side effects.
+receiver.coerceToUnit(context.irBuiltIns, this@JvmOptimizationLowering.context.typeSystem) +receiver.coerceToUnit(context.irBuiltIns, this@JvmOptimizationLowering.context.typeSystem)
} }
if (accessor.valueParameters.size > 0) { if (accessor.valueParameters.isNotEmpty()) {
+irSetField( +irSetField(
receiver.takeUnless { backingField.isStatic }, receiver.takeUnless { backingField.isStatic },
backingField, backingField,