From d27097a6c9459d38e7c9f92a1fcfa77352a9e07d Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Fri, 16 Dec 2016 16:14:39 +0000
Subject: Clear exception if FindClass fails.

Test: verifier_deps_test.
bug: 30937355
Change-Id: I9916ec00010de012939462d4f30147e8b64fe279
---
 compiler/driver/compiler_driver.cc | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'compiler/driver/compiler_driver.cc')

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.
-- 
cgit v1.2.3-59-g8ed1b