From fe51c35298dfb915dfeb54418f28906a78ccdb5f Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Mon, 19 Sep 2016 11:44:02 +0300
Subject: [PATCH] Fix for 'getNthResult' in IfThenElse expression impl

---
 .../kotlin/ir/expressions/impl/IrIfThenElseImpl.kt    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt
index 3fb78d5f1e5..2da89d1f8d4 100644
--- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt
+++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/expressions/impl/IrIfThenElseImpl.kt
@@ -45,7 +45,16 @@ class IrIfThenElseImpl(
             if (n == 0) condition else null
 
     override fun getNthResult(n: Int): IrExpression? =
-            if (n == 0) thenBranch else null
+            when (n) {
+                0 -> {
+                    thenBranch
+                }
+                1 -> {
+                    elseBranch
+                }
+                else -> null
+            }
+
 
     override fun putNthCondition(n: Int, expression: IrExpression) {
         if (n == 0) condition = expression