commit 12b7ea1bdc97b35822aa939e19a6211d60eaaee7
author Nicolas Geoffray <ngeoffray@google.com> Thu May 07 14:59:31 2020 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon May 11 09:47:22 2020 +0000
tree ae7ca2419140be6751663f0e6bfd8d3861a9fac0
parent 75b961a4cd926e647eb20ebf20ec5af410f7e1df

Handle the case a boot classpath class fails to verify.

Test: boot
Bug: 155852343
Change-Id: Ide5d546ce33b38614957bce89c215791dc9d044c

runtime/jit/jit.cc

diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc
index df26ca4..2e49067 100644
--- a/runtime/jit/jit.cc
+++ b/runtime/jit/jit.cc
@@ -914,7 +914,12 @@
           continue;
         }
         ++number_of_classes;
-        linker->VerifyClass(self, klass);
+        if (linker->VerifyClass(self, klass) == verifier::FailureKind::kHardFailure) {
+          DCHECK(self->IsExceptionPending());
+          LOG(FATAL) << "Methods in the boot classpath failed to verify: "
+                     << self->GetException()->Dump();
+        }
+        CHECK(!self->IsExceptionPending());
       }
     }
     LOG(INFO) << "Verified "