Merge "Clear exception if FindClass fails."

1 files changed, 3 insertions, 0 deletions

diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index b6b2575c3a..d1a5c4d9ab 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -2077,6 +2077,9 @@ void CompilerDriver::Verify(jobject jclass_loader,
               if (cls.Get() != nullptr) {
                 ObjectLock<mirror::Class> lock(soa.Self(), cls);
                 mirror::Class::SetStatus(cls, mirror::Class::kStatusVerified, soa.Self());
+              } else {
+                DCHECK(soa.Self()->IsExceptionPending());
+                soa.Self()->ClearException();
               }
               // Create `VerifiedMethod`s for each methods, the compiler expects one for
               // quickening or compiling.