Merge "Revert "Fallback to quick in case of soft verification errors""

4 files changed, 0 insertions, 61 deletions

diff --git a/test/471-uninitialized-locals/expected.txt b/test/471-uninitialized-locals/expected.txt
deleted file mode 100644
index e69de29..0000000
--- a/test/471-uninitialized-locals/expected.txt
+++ /dev/null
diff --git a/test/471-uninitialized-locals/info.txt b/test/471-uninitialized-locals/info.txt
deleted file mode 100644
index ebead8e..0000000
--- a/test/471-uninitialized-locals/info.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Regression for the optimizing for crashes during compilation of methods which
-use values before initializing them.
diff --git a/test/471-uninitialized-locals/smali/Test.smali b/test/471-uninitialized-locals/smali/Test.smali
deleted file mode 100644
index 17a14bf..0000000
--- a/test/471-uninitialized-locals/smali/Test.smali
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-.class public LTest;
-
-.super Ljava/lang/Object;
-
-.method public static ThrowException()V
-   .registers 1
-   throw v0
-.end method
diff --git a/test/471-uninitialized-locals/src/Main.java b/test/471-uninitialized-locals/src/Main.java
deleted file mode 100644
index b24c518..0000000
--- a/test/471-uninitialized-locals/src/Main.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.lang.reflect.Method;
-
-public class Main {
-
-  public static void main(String args[]) throws Exception {
-    // Workaround for b/18051191.
-    System.out.println("Test started");
-    try {
-      Class<?> c = Class.forName("Test");
-      Method m = c.getMethod("ThrowException", (Class[]) null);
-      m.invoke(null, (Object[]) null);
-    } catch (VerifyError e) {
-       // Compilation should go fine but we expect the runtime verification to fail.
-      return;
-    }
-
-    throw new Error("Failed to preset verification error!");
-  }
-
-}