commit 0d87f99907f01ced713bf2dff97ee6655da077f3
author Andreas Gampe <agampe@google.com> Wed Jul 10 13:19:45 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 11 23:12:52 2019 +0000
tree 7e015521b706acdcedf5404f8e2f936e12b74cc4
parent 4146e064849cd566dfb5d9f851f95fb490ec0836

ART: Remove VERIFY_ERROR_UNRESOLVED_CATCH

Replace with a more generic SKIP_COMPILER, mark the Fail() calls as not
throwing, and replace the standard occurrence with NO_CLASS.

Bug: 121245951
Test: m test-art-host
Test: art/test/testrunner/testrunner.py -b --host -t 800 --jit-on-first-use
Change-Id: I9f601702f27d815840538c04b332a52bf1c58c54

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 02b1cbd..8d9176a 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3829,12 +3829,13 @@
 
           // We need to post a failure. The compiler currently does not handle unreachable
           // code correctly.
-          Fail(VERIFY_ERROR_UNRESOLVED_CATCH) << "Unresolved catch handler, fail for compiler";
+          Fail(VERIFY_ERROR_SKIP_COMPILER, /*pending_exc=*/ false)
+              << "Unresolved catch handler, fail for compiler";
 
           return std::make_pair(false, unresolved);
         }
         // Soft-fail, but do not handle this with a synthetic throw.
-        Fail(VERIFY_ERROR_UNRESOLVED_CATCH) << "Unresolved catch handler";
+        Fail(VERIFY_ERROR_NO_CLASS, /*pending_exc=*/ false) << "Unresolved catch handler";
         if (common_super != nullptr) {
           unresolved = &unresolved->Merge(*common_super, &reg_types_, this);
         }
@@ -5574,7 +5575,7 @@
         break;
       }
 
-      case VERIFY_ERROR_UNRESOLVED_CATCH:
+      case VERIFY_ERROR_SKIP_COMPILER:
         // Nothing to do, just remember the failure type.
         break;
     }