Multiple fixes for try-catch-finally codegen

#KT-2259 Fixed
 #KT-2577 Fixed

compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java

@@ -2717,25 +2717,38 @@ The "returned" value of try expression with no finally is either the last expres
 (or blocks).
          */
         JetFinallySection finallyBlock = expression.getFinallyBlock();
+        FinallyBlockStackElement finallyBlockStackElement = null;
         if (finallyBlock != null) {
-            blockStackElements.push(new FinallyBlockStackElement(expression));
+            finallyBlockStackElement = new FinallyBlockStackElement(expression);
+            blockStackElements.push(finallyBlockStackElement);
         }
 
         JetType jetType = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression);
         Type expectedAsmType = asmType(jetType);
-        
+
         Label tryStart = new Label();
         v.mark(tryStart);
         v.nop(); // prevent verify error on empty try
+
         gen(expression.getTryBlock(), expectedAsmType);
+
+        int savedValue = myFrameMap.enterTemp(expectedAsmType.getSize());
+        v.store(savedValue, expectedAsmType);
+
         Label tryEnd = new Label();
         v.mark(tryEnd);
         if (finallyBlock != null) {
+            blockStackElements.pop();
             gen(finallyBlock.getFinalExpression(), Type.VOID_TYPE);
+            blockStackElements.push(finallyBlockStackElement);
         }
         Label end = new Label();
-        v.goTo(end);         // TODO don't generate goto if there's no code following try/catch
-        for (JetCatchClause clause : expression.getCatchClauses()) {
+        v.goTo(end);
+
+        List<JetCatchClause> clauses = expression.getCatchClauses();
+        for (int i = 0, size = clauses.size(); i < size; i++) {
+            JetCatchClause clause = clauses.get(i);
+
             Label clauseStart = new Label();
             v.mark(clauseStart);
 
@@ -2748,28 +2761,45 @@ The "returned" value of try expression with no finally is either the last expres
 
             gen(clause.getCatchBody(), expectedAsmType);
 
+            v.store(savedValue, expectedAsmType);
+
             myFrameMap.leave(descriptor);
 
             if (finallyBlock != null) {
+                blockStackElements.pop();
                 gen(finallyBlock.getFinalExpression(), Type.VOID_TYPE);
+                blockStackElements.push(finallyBlockStackElement);
             }
 
-            v.goTo(end);     // TODO don't generate goto if there's no code following try/catch
+            if (i != size - 1 || finallyBlock != null) {
+                v.goTo(end);
+            }
 
             v.visitTryCatchBlock(tryStart, tryEnd, clauseStart, descriptorType.getInternalName());
         }
+
         if (finallyBlock != null) {
             Label finallyStart = new Label();
             v.mark(finallyStart);
 
+            int savedException = myFrameMap.enterTemp();
+            v.store(savedException, TYPE_THROWABLE);
+
+            blockStackElements.pop();
             gen(finallyBlock.getFinalExpression(), Type.VOID_TYPE);
+            blockStackElements.push(finallyBlockStackElement);
+
+            v.load(savedException, TYPE_THROWABLE);
+            myFrameMap.leaveTemp();
 
             v.athrow();
 
             v.visitTryCatchBlock(tryStart, tryEnd, finallyStart, null);
         }
         v.mark(end);
-        v.nop();
+
+        v.load(savedValue, expectedAsmType);
+        myFrameMap.leaveTemp(expectedAsmType.getSize());
 
         if (finallyBlock != null) {
             blockStackElements.pop();

compiler/testData/codegen/controlStructures/tryCatchFinallyChain.kt

@@ -0,0 +1,19 @@
+fun box() : String {
+    try {
+    } finally {
+        try {
+            try {
+            } finally {
+                try {
+                } finally {
+                }
+            }
+        } catch (e: Exception) {
+            try {
+            } catch (f: Exception) {
+            } finally {
+            }
+        }
+        return "OK"
+    }
+}

compiler/testData/codegen/regressions/kt2259.kt

@@ -0,0 +1,10 @@
+fun main(args: Array<String>) {
+    try {
+    } finally {
+        try {
+        } catch (e: Throwable) {
+        }
+    }
+}
+
+fun box() = "OK"

compiler/testData/codegen/regressions/kt2577.kt

@@ -0,0 +1,12 @@
+fun foo(): Int {
+    try {
+    } finally {
+        try {
+            return 1
+        } catch (e: Throwable) {
+            return 2
+        }
+    }
+}
+
+fun box() = if (foo() == 1) "OK" else "Fail"

compiler/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java

@@ -376,4 +376,19 @@ public class ControlStructuresTest extends CodegenTestCase {
         createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
         blackBoxFile("regressions/kt2291.kt");
     }
+
+    public void testKt2259() {
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+        blackBoxFile("regressions/kt2259.kt");
+    }
+
+    public void testKt2577() {
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+        blackBoxFile("regressions/kt2577.kt");
+    }
+
+    public void testTryCatchFinallyChain() {
+        createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_ONLY);
+        blackBoxFile("controlStructures/tryCatchFinallyChain.kt");
+    }
 }