Merge "Fix illegal code generation of TryWithResourcesTransformer" into ub-jack

2 files changed, 29 insertions, 0 deletions

diff --git a/jack-tests/tests/com/android/jack/java7/trywithresources/test002/dx/Tests.java b/jack-tests/tests/com/android/jack/java7/trywithresources/test002/dx/Tests.java
index aa47320..641274d 100644
--- a/jack-tests/tests/com/android/jack/java7/trywithresources/test002/dx/Tests.java
+++ b/jack-tests/tests/com/android/jack/java7/trywithresources/test002/dx/Tests.java
@@ -91,4 +91,9 @@ import org.junit.Test;
     public void test013() {
        Assert.assertTrue(TryWithResourcesTest002.m13());
     }
+
+    @Test
+    public void test014() throws Exception {
+      Assert.assertTrue(TryWithResourcesTest002.m14(1));
+    }
 }
diff --git a/jack-tests/tests/com/android/jack/java7/trywithresources/test002/jack/TryWithResourcesTest002.java b/jack-tests/tests/com/android/jack/java7/trywithresources/test002/jack/TryWithResourcesTest002.java
index 5b9ea0e..6a58bc3 100644
--- a/jack-tests/tests/com/android/jack/java7/trywithresources/test002/jack/TryWithResourcesTest002.java
+++ b/jack-tests/tests/com/android/jack/java7/trywithresources/test002/jack/TryWithResourcesTest002.java
@@ -270,4 +270,28 @@ public class TryWithResourcesTest002 {
     return result;
   }
 
+  private static boolean getMaybeThrow(int condition) throws E1 {
+    if (condition < 5) {
+      return true;
+    } else if (condition > 15) {
+      return false;
+    }
+    throw new E1();
+  }
+
+  public static boolean m14(int condition) throws Exception {
+    Observer o1 = new Observer();
+    try (
+        AutoCloseable001 ac1 = new AutoCloseable001(o1);
+        ) {
+      if (condition < 10) {
+        return getMaybeThrow(condition + 2);
+      }
+      return getMaybeThrow(condition);
+      // No exception
+    } catch (E1 e) {
+      return getMaybeThrow(condition - 10);
+    }
+  }
+
 }