commit 501c3b073e2252f8f5ccb0f9a7aab9bcf8ad297c
author Andreas Gampe <agampe@google.com> Wed Apr 17 21:54:27 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 18 16:08:27 2019 +0000
tree d09085d3dcab7eab57e2c826f8073a7ee4bd8449
parent ed42f62df5bb46168334dadecb5d143c38f7a88b

Revert^2 "Fix correctness for fast path class loading"

This reverts commit 2e2f9e8c6989dec22e4199a773a1e03954f82365.

Bug: 130310316
Bug: 130293184
Bug: 130209120
Bug: 130746382

Test: m test-art-host
Test: atest vm-tests-tf

Change-Id: I2b6e6be530bb8b6c6222b11b7d93fb1f574d2ea4

runtime/native/java_lang_VMClassLoader.cc

diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index 46162c1..11e02a2 100644
--- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -57,8 +57,12 @@
       REQUIRES_SHARED(Locks::mutator_lock_) {
     ObjPtr<mirror::Class> result;
     if (cl->FindClassInBaseDexClassLoader(soa, self, descriptor, hash, class_loader, &result)) {
+      DCHECK(!self->IsExceptionPending());
       return result;
     }
+    if (self->IsExceptionPending()) {
+      self->ClearException();
+    }
     return nullptr;
   }
 };