commit 3a8dfcf7915cbfb479c9d296ebd3354a3e96baba
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 06 14:29:39 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Sep 06 17:05:20 2021 +0000
tree a8d3d466d90c5bb5322823a8bdc69f40e7bb216d
parent e172a80e18f5c4db7aad1b0ff2cc5ae04983c234

Catch clauses should only have throwable types.

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

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 23d4de0..446f2e1 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3711,7 +3711,7 @@
                     unresolved = &unresolved->SafeMerge(exception, &reg_types_, this);
                   }
                 } else {
-                  Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "unexpected non-exception class "
+                  Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "unexpected non-throwable class "
                                                     << exception;
                   return std::make_pair(true, &reg_types_.Conflict());
                 }