From 8e1bff0e37ce83246a1ab9bf0d544a26ef4e6c05 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Mon, 22 Oct 2018 14:01:54 +0300
Subject: [PATCH] Additional diagnostic for internal state during jvm codegen

---
 .../org/jetbrains/kotlin/codegen/ExpressionCodegen.java    | 7 ++++++-
 .../inline/MaxStackFrameSizeAndLocalsCalculator.java       | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
index 2729b0b6426..ddecf7a05e7 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
@@ -4570,7 +4570,12 @@ The "returned" value of try expression with no finally is either the last expres
     private void generateExceptionTable(@NotNull Label catchStart, @NotNull List<Label> catchedRegions, @Nullable String exception) {
         for (int i = 0; i < catchedRegions.size(); i += 2) {
             Label startRegion = catchedRegions.get(i);
-            Label endRegion = catchedRegions.get(i+1);
+            Label endRegion = catchedRegions.get(i + 1);
+
+            if (startRegion.info == null || endRegion.info == null || catchStart.info == null) {
+                throw new IllegalStateException("All labels should have nodes added to instruction list");
+            }
+
             v.visitTryCatchBlock(startRegion, endRegion, catchStart, exception);
         }
     }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
index b3ccb089c34..efb70328e9d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java
@@ -314,6 +314,10 @@ public class MaxStackFrameSizeAndLocalsCalculator extends MaxLocalsCalculator {
             LabelWrapper e = handler.end;
 
             while (l != e) {
+                if (l == null) {
+                    throw new IllegalStateException("Bad exception handler end");
+                }
+
                 l.addSuccessor(handler.handlerLabel, 0, true);
                 l = l.nextLabel;
             }