commit adc11b1350658af7acef4b72af785ae1ec3ae2bf
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 06 14:19:28 2021 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 07 10:36:37 2021 +0000
tree 5823847a964d586a47240de5bdb571afa45a5882
parent 87565852303a0c807f2ee6cdd33cef02a80b72bd

Turn unconditional soft failure into a hard failure.

The failure isn't going to change at runtime.

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

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 72be777..0d9cf1c 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3649,7 +3649,7 @@
   DCHECK(result != nullptr);
   if (result->IsConflict()) {
     const char* descriptor = dex_file_->StringByTypeIdx(class_idx);
-    Fail(VERIFY_ERROR_BAD_CLASS_SOFT) << "accessing broken descriptor '" << descriptor
+    Fail(VERIFY_ERROR_BAD_CLASS_HARD) << "accessing broken descriptor '" << descriptor
         << "' in " << GetDeclaringClass();
     return *result;
   }