ART: Rerun verifier in verbose mode on boot cp failure

When we fail to verify a boot classpath class during boot image
compilation, re-run the verifier in verbose mode to print soft failures
before aborting.

Bug: 64290614
Test: m test-art-host
Test: manual
Change-Id: I1c875ee4a5a73f80b7f8b75be35ed885bc0bf427

1 files changed, 18 insertions, 2 deletions

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index 037e45840d..7ea75ebd4c 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -2110,8 +2110,24 @@ class VerifyClassVisitor : public CompilationVisitor {
         // invokes once verifier support is fully implemented.
         if (manager_->GetCompiler()->GetCompilerOptions().IsBootImage() &&
             !android::base::StartsWith(descriptor, "Ljava/lang/invoke/")) {
-          DCHECK(klass->IsVerified()) << "Boot classpath class " << klass->PrettyClass()
-              << " failed to fully verify: state= " << klass->GetStatus();
+          if (!klass->IsVerified()) {
+            // Re-run verification to get all failure messages if it soft-failed.
+            if (!klass->IsErroneous()) {
+              gLogVerbosity.verifier = true;
+              // Note: We can't call ClassLinker::VerifyClass, as it will elide the second
+              //       verification.
+              Runtime* runtime = Runtime::Current();
+              std::string v_error;
+              verifier::MethodVerifier::VerifyClass(soa.Self(),
+                                                    klass.Get(),
+                                                    runtime->GetCompilerCallbacks(),
+                                                    runtime->IsAotCompiler(),
+                                                    verifier::HardFailLogMode::kLogInternalFatal,
+                                                    &v_error);
+            }
+            LOG(FATAL) << "Boot classpath class " << klass->PrettyClass()
+                       << " failed to fully verify: state= " << klass->GetStatus();
+          }
         }
         if (klass->IsVerified()) {
           DCHECK_EQ(failure_kind, verifier::FailureKind::kNoFailure);