commit a3b9d4eda1ef0845f307891f349eaf752750ac16
author Mathieu Chartier <mathieuc@google.com> Wed Jun 17 14:14:36 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jun 17 14:14:36 2015 -0700
tree 88eb594031c79a5a831155bcc529741e98568a8b
parent afe9e134a773242b142b0740383f085f08ec1cba

Add missing EndAssertNoThreadSuspension

Bug: 21872507
Change-Id: I20f9920e4a12511ce498c252bca955d82a4f4102

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 91812e7..31749bf 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -4901,6 +4901,9 @@
           if (interface_name_comparator.HasSameNameAndSignature(
               vtable_method_for_name_comparison)) {
             if (!vtable_method->IsAbstract() && !vtable_method->IsPublic()) {
+              // Must do EndAssertNoThreadSuspension before throw since the throw can cause
+              // allocations.
+              self->EndAssertNoThreadSuspension(old_cause);
               ThrowIllegalAccessError(klass.Get(),
                   "Method '%s' implementing interface method '%s' is not public",
                   PrettyMethod(vtable_method).c_str(), PrettyMethod(interface_method).c_str());