Revert "ART: Register allocation and runtime support for try/catch"
Breaks libcore test org.apache.harmony.security.tests.java.security.KeyStorePrivateKeyEntryTest#testGetCertificateChain. Need to investigate.
This reverts commit b022fa1300e6d78639b3b910af0cf85c43df44bb.
Change-Id: Ib24d3a80064d963d273e557a93469c95f37b1f6f
diff --git a/test/510-checker-try-catch/src/Main.java b/test/510-checker-try-catch/src/Main.java
index 25cdc0e..ae78ba0 100644
--- a/test/510-checker-try-catch/src/Main.java
+++ b/test/510-checker-try-catch/src/Main.java
@@ -14,55 +14,10 @@
* limitations under the License.
*/
-import java.lang.reflect.Method;
-
public class Main {
// Workaround for b/18051191.
class InnerClass {}
- public enum TestPath {
- ExceptionalFlow1(true, false, 3),
- ExceptionalFlow2(false, true, 8),
- NormalFlow(false, false, 42);
-
- TestPath(boolean arg1, boolean arg2, int expected) {
- this.arg1 = arg1;
- this.arg2 = arg2;
- this.expected = expected;
- }
-
- public boolean arg1;
- public boolean arg2;
- public int expected;
- }
-
- public static void testMethod(String method) throws Exception {
- Class<?> c = Class.forName("Runtime");
- Method m = c.getMethod(method, new Class[] { boolean.class, boolean.class });
-
- for (TestPath path : TestPath.values()) {
- Object[] arguments = new Object[] { path.arg1, path.arg2 };
- int actual = (Integer) m.invoke(null, arguments);
-
- if (actual != path.expected) {
- throw new Error("Method: \"" + method + "\", path: " + path + ", " +
- "expected: " + path.expected + ", actual: " + actual);
- }
- }
- }
-
- public static void main(String[] args) throws Exception {
- testMethod("testUseAfterCatch_int");
- testMethod("testUseAfterCatch_long");
- testMethod("testUseAfterCatch_float");
- testMethod("testUseAfterCatch_double");
- testMethod("testCatchPhi_const");
- testMethod("testCatchPhi_int");
- testMethod("testCatchPhi_long");
- testMethod("testCatchPhi_float");
- testMethod("testCatchPhi_double");
- testMethod("testCatchPhi_singleSlot");
- testMethod("testCatchPhi_doubleSlot");
- }
+ public static void main(String[] args) {}
}