From e7eb078c3f49ffd5e41077593fe3c405e0269b01 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Tue, 23 May 2017 15:35:46 +0300
Subject: [PATCH] Minor: remove always true is-check

---
 .../kotlin/psi2ir/generators/BodyGenerator.kt | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
index 2c223110964..384d60d4269 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
@@ -74,21 +74,19 @@ class BodyGenerator(
             statementGenerator.declareComponentVariablesInBlock(ktDestructuringDeclaration, irBlockBody, parameterValue)
         }
 
-        if (ktBody is KtBlockExpression) {
-            val ktBodyStatements = ktBody.statements
-            if (ktBodyStatements.isNotEmpty()) {
-                for (ktStatement in ktBodyStatements.dropLast(1)) {
-                    irBlockBody.statements.add(statementGenerator.generateStatement(ktStatement))
-                }
-                val ktReturnedValue = ktBodyStatements.last()
-                statementGenerator.generateReturnExpression(ktReturnedValue, irBlockBody)
-            }
-            else {
-                irBlockBody.statements.add(generateReturnExpression(
-                        ktBody.startOffset, ktBody.endOffset,
-                        IrGetObjectValueImpl(ktBody.startOffset, ktBody.endOffset, context.builtIns.unitType,
-                                             context.symbolTable.referenceClass(context.builtIns.unit))))
+        val ktBodyStatements = ktBody.statements
+        if (ktBodyStatements.isNotEmpty()) {
+            for (ktStatement in ktBodyStatements.dropLast(1)) {
+                irBlockBody.statements.add(statementGenerator.generateStatement(ktStatement))
             }
+            val ktReturnedValue = ktBodyStatements.last()
+            statementGenerator.generateReturnExpression(ktReturnedValue, irBlockBody)
+        }
+        else {
+            irBlockBody.statements.add(generateReturnExpression(
+                    ktBody.startOffset, ktBody.endOffset,
+                    IrGetObjectValueImpl(ktBody.startOffset, ktBody.endOffset, context.builtIns.unitType,
+                                         context.symbolTable.referenceClass(context.builtIns.unit))))
         }
 
         return irBlockBody