From c8bc2d9d16a4f1b4dcf2da76f7a767cc1128fef3 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <dmitry.petrov@jetbrains.com>
Date: Thu, 27 Jul 2017 14:38:07 +0300
Subject: [PATCH] Minor: code cleanup

---
 .../optimization/common/MethodAnalyzer.kt     | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
index a97c68040f8..c4903835bc1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/MethodAnalyzer.kt
@@ -146,10 +146,10 @@ open class MethodAnalyzer<V : Value>(
 
             }
             catch (e: AnalyzerException) {
-                throw AnalyzerException(e.node, "Error at instruction #" + insn + " ${insnNode.insnText}: " + e.message, e)
+                throw AnalyzerException(e.node, "Error at instruction #$insn ${insnNode.insnText}: ${e.message}", e)
             }
             catch (e: Exception) {
-                throw AnalyzerException(insnNode, "Error at instruction #" + insn + " ${insnNode.insnText}: " + e.message, e)
+                throw AnalyzerException(insnNode, "Error at instruction #$insn ${insnNode.insnText}: ${e.message}", e)
             }
 
         }
@@ -236,7 +236,7 @@ open class MethodAnalyzer<V : Value>(
         for (tcb in m.tryCatchBlocks) {
             val begin = instructions.indexOf(tcb.start)
             val end = instructions.indexOf(tcb.end)
-            for (j in begin..end - 1) {
+            for (j in begin until end) {
                 var insnHandlers: MutableList<TryCatchBlockNode>? = handlers[j]
                 if (insnHandlers == null) {
                     insnHandlers = ArrayList<TryCatchBlockNode>()
@@ -249,15 +249,13 @@ open class MethodAnalyzer<V : Value>(
 
     private fun mergeControlFlowEdge(insn: Int, frame: Frame<V>) {
         val oldFrame = frames[insn]
-        val changes: Boolean
-
-        if (oldFrame == null) {
-            frames[insn] = newFrame(frame)
-            changes = true
-        }
-        else {
-            changes = oldFrame.merge(frame, interpreter)
-        }
+        val changes =
+                if (oldFrame != null)
+                    oldFrame.merge(frame, interpreter)
+                else {
+                    frames[insn] = newFrame(frame)
+                    true
+                }
         if (changes && !queued[insn]) {
             queued[insn] = true
             queue[top++] = insn