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

Fix interpreter error related to incorrect work of get value for objects

Browse Source
This commit is contained in:
Ivan Kylchik
2020-08-31 19:17:47 +03:00
committed by TeamCityServer
parent d931e2eead
commit b98f680d65
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+5 -2
View File
@@ -569,9 +569,12 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns, private val bodyMap: Map
} }
private fun interpretGetValue(expression: IrGetValue): ExecutionResult { private fun interpretGetValue(expression: IrGetValue): ExecutionResult {
val owner = expression.type.classOrNull?.owner val expectedClass = expression.type.classOrNull?.owner
// used to evaluate constants inside object // used to evaluate constants inside object
if (owner != null && owner.isObject) return getOrCreateObjectValue(owner) // TODO is this correct behaviour? if (expectedClass != null && expectedClass.isObject && expression.symbol.owner.origin == IrDeclarationOrigin.INSTANCE_RECEIVER) {
// TODO is this correct behaviour?
return getOrCreateObjectValue(expectedClass)
}
stack.pushReturnValue(stack.getVariable(expression.symbol).state) stack.pushReturnValue(stack.getVariable(expression.symbol).state)
return Next return Next
} }