commit ebefce33baed0dccd5ab703bff37cb14c3da8572
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 06 14:47:17 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 07 12:43:32 2021 +0000
tree 8535e9d6029adcea0f9d1fda0ca1da798edbe5ca
parent adc11b1350658af7acef4b72af785ae1ec3ae2bf

Make it a hard failure if we could not find a catch clause.

Test: test.py
Bug: 28313047
Change-Id: Ib80c771cc9d730909d00792c1f1d28b9c46f1a24

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 0d9cf1c..b263439 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3747,8 +3747,8 @@
       }
     }
     if (common_super == nullptr) {
-      /* no catch blocks, or no catches with classes we can find */
-      Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "unable to find exception handler";
+      /* No catch block */
+      Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "unable to find exception handler";
       return std::make_pair(true, &reg_types_.Conflict());
     }
     return std::make_pair(true, common_super);