Fix for KT-16532: Kotlin 1.1 RC - Android cross-inline synchronized won't run

Finnaly markers are used only for non-local return processing and are removed after inlining  to non-inline functions, same deletion should be performed on inlining to anonymous objects

 #KT-16532 Fixed

Author: Mikhael Bogdanov

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java

@@ -141,12 +141,12 @@ public void visitEnd() {
         List<CapturedParamInfo> additionalFakeParams =
                 extractParametersMappingAndPatchConstructor(constructor, allCapturedParamBuilder, constructorParamBuilder,
                                                             transformationInfo, parentRemapper);
-        List<MethodVisitor> deferringMethods = new ArrayList<MethodVisitor>();
+        List<DeferredMethodVisitor> deferringMethods = new ArrayList<DeferredMethodVisitor>();
 
         generateConstructorAndFields(classBuilder, allCapturedParamBuilder, constructorParamBuilder, parentRemapper, additionalFakeParams);
 
         for (MethodNode next : methodsToTransform) {
-            MethodVisitor deferringVisitor = newMethod(classBuilder, next);
+            DeferredMethodVisitor deferringVisitor = newMethod(classBuilder, next);
             InlineResult funResult =
                     inlineMethodAndUpdateGlobalResult(parentRemapper, deferringVisitor, next, allCapturedParamBuilder, false);
 
@@ -161,7 +161,8 @@ public void visitEnd() {
             deferringMethods.add(deferringVisitor);
         }
 
-        for (MethodVisitor method : deferringMethods) {
+        for (DeferredMethodVisitor method : deferringMethods) {
+            InlineCodegenUtil.removeFinallyMarkers(method.getIntermediate());
             method.visitEnd();
         }
 
@@ -313,6 +314,7 @@ private void generateConstructorAndFields(
         MethodNode intermediateMethodNode =
                 new MethodNode(AsmUtil.NO_FLAG_PACKAGE_PRIVATE, "<init>", constructorDescriptor, null, ArrayUtil.EMPTY_STRING_ARRAY);
         inlineMethodAndUpdateGlobalResult(parentRemapper, intermediateMethodNode, constructor, constructorInlineBuilder, true);
+        InlineCodegenUtil.removeFinallyMarkers(intermediateMethodNode);
 
         AbstractInsnNode first = intermediateMethodNode.instructions.getFirst();
         final Label oldStartLabel = first instanceof LabelNode ? ((LabelNode) first).getLabel() : null;

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java

@@ -466,7 +466,9 @@ public boolean isMyLabel(@NotNull String name) {
                 adapter, infos, ((StackValue.Local) remapper.remap(parameters.getArgsSizeOnStack() + 1).value).index
         );
         removeStaticInitializationTrigger(adapter);
-        removeFinallyMarkers(adapter);
+        if (!InlineCodegenUtil.isFinallyMarkerRequired(codegen.getContext())) {
+            InlineCodegenUtil.removeFinallyMarkers(adapter);
+        }
 
         adapter.accept(new MethodBodyVisitor(codegen.v));
 
@@ -1024,25 +1026,6 @@ private void generateAndInsertFinallyBlocks(
         //processor.substituteLocalVarTable(intoNode);
     }
 
-    private void removeFinallyMarkers(@NotNull MethodNode intoNode) {
-        if (InlineCodegenUtil.isFinallyMarkerRequired(codegen.getContext())) return;
-
-        InsnList instructions = intoNode.instructions;
-        AbstractInsnNode curInstr = instructions.getFirst();
-        while (curInstr != null) {
-            if (InlineCodegenUtil.isFinallyMarker(curInstr)) {
-                AbstractInsnNode marker = curInstr;
-                //just to assert
-                getConstant(marker.getPrevious());
-                curInstr = curInstr.getNext();
-                instructions.remove(marker.getPrevious());
-                instructions.remove(marker);
-                continue;
-            }
-            curInstr = curInstr.getNext();
-        }
-    }
-
     @NotNull
     public static SourceMapper createNestedSourceMapper(@NotNull SMAPAndMethodNode nodeAndSmap, @NotNull SourceMapper parent) {
         return new NestedSourceMapper(parent, nodeAndSmap.getSortedRanges(), nodeAndSmap.getClassSMAP().getSourceInfo());

compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java

@@ -466,6 +466,23 @@ else if (opcode == Opcodes.BIPUSH || opcode == Opcodes.SIPUSH) {
         }
     }
 
+    public static void removeFinallyMarkers(@NotNull MethodNode intoNode) {
+        InsnList instructions = intoNode.instructions;
+        AbstractInsnNode curInstr = instructions.getFirst();
+        while (curInstr != null) {
+            if (isFinallyMarker(curInstr)) {
+                AbstractInsnNode marker = curInstr;
+                //just to assert
+                getConstant(marker.getPrevious());
+                curInstr = curInstr.getNext();
+                instructions.remove(marker.getPrevious());
+                instructions.remove(marker);
+                continue;
+            }
+            curInstr = curInstr.getNext();
+        }
+    }
+
     public static void addInlineMarker(@NotNull InstructionAdapter v, boolean isStartNotEnd) {
         v.visitMethodInsn(
                 Opcodes.INVOKESTATIC, INLINE_MARKER_CLASS_NAME,

compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt

@@ -0,0 +1,25 @@
+inline fun test(crossinline l: () -> String) {
+    {
+        l()
+    }()
+
+    object {
+        val z = l() //constuctor
+    }
+}
+
+
+fun box(): String {
+    var z = "fail"
+    test {
+        synchronized("123") {
+            z = "OK"
+            z
+        }
+    }
+
+    return z
+}
+
+// 0 finallyStart
+// 0 finallyEnd

compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java

@@ -1247,6 +1247,12 @@ public void testAllFilesPresentInInline() throws Exception {
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/inline"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
+        @TestMetadata("finallyMarkers.kt")
+        public void testFinallyMarkers() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("inlineReturnsNothing1.kt")
         public void testInlineReturnsNothing1() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/inlineReturnsNothing1.kt");