commit 8502f72d0e5257c1ff9c61e0567146568d39ee6d
author Mathieu Chartier <mathieuc@google.com> Wed Jun 08 15:09:08 2016 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jun 08 15:09:33 2016 -0700
tree 0702b14c63e61da83a66c02dee3294fe180af38c
parent 5a9ecac3c931f93925c25aa086c39effe12b0759

Add a few more pending exception checks

Bug: 28371539

Change-Id: Ibd2f7ccf7bd8cf7ef6c24534be1efbcc9b30014a

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 15cc634..db0e9ac 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -4977,6 +4977,7 @@
   DCHECK(c.Get() != nullptr);
   if (c->IsInitialized()) {
     EnsureSkipAccessChecksMethods(c);
+    self->AssertNoPendingException();
     return true;
   }
   const bool success = InitializeClass(self, c, can_init_fields, can_init_parents);