From b570d3f7fddd9bb31efd7b66a4c82746a0ab264a Mon Sep 17 00:00:00 2001
From: Ivan Kylchik <ivan.kylchik@jetbrains.com>
Date: Mon, 31 Aug 2020 19:26:41 +0300
Subject: [PATCH] Fix interpreter error related to recreating Unit object

---
 .../src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
index 4550f1a6d2c..fb7f04c9060 100644
--- a/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+++ b/compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
@@ -455,7 +455,7 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns, private val bodyMap: Map
     }
 
     private fun interpretStatements(statements: List<IrStatement>): ExecutionResult {
-        if (statements.isEmpty()) return Next.apply { stack.pushReturnValue(Common(irBuiltIns.unitClass.owner)) }
+        if (statements.isEmpty()) return getOrCreateObjectValue(irBuiltIns.unitClass.owner)
         var executionResult: ExecutionResult = Next
         for (statement in statements) {
             when (statement) {