Merge pull request #497 from bintree/master

Fixed KT-5493: NPE fix

compiler/backend/src/org/jetbrains/jet/codegen/optimization/boxing/RedundantNullCheckMethodTransformer.java

@@ -56,7 +56,7 @@ public class RedundantNullCheckMethodTransformer extends MethodTransformer {
             AbstractInsnNode insn = insnList.get(i);
 
             if ((insn.getOpcode() == Opcodes.IFNULL || insn.getOpcode() == Opcodes.IFNONNULL) &&
-                frame.getStack(frame.getStackSize() - 1) instanceof BoxedBasicValue) {
+                frame != null && frame.getStack(frame.getStackSize() - 1) instanceof BoxedBasicValue) {
 
                 insnsToOptimize.add(insn);
             }

compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt

@@ -0,0 +1,8 @@
+fun box() : String {
+    try {
+        return "OK"
+    }
+    finally {
+        null?.hashCode()
+    }
+}

compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java

@@ -119,6 +119,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/fold.kt");
         }
         
+        @TestMetadata("kt5493.kt")
+        public void testKt5493() throws Exception {
+            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt");
+        }
+        
         @TestMetadata("nullCheck.kt")
         public void testNullCheck() throws Exception {
             doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/nullCheck.kt");