commit 4d122c180c3ff8c677cbaae83e856acf0d856498
author Mathieu Chartier <mathieuc@google.com> Wed Jun 17 14:14:36 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Jun 17 14:30:59 2015 -0700
tree 2551515ef0f48620ac5dca714a8cf63d78eb276c
parent b66fda7c7e2e3c24e2a146c3f9d904b1828346a1

Add missing EndAssertNoThreadSuspension

(cherry picked from commit a3b9d4eda1ef0845f307891f349eaf752750ac16)

Bug: 21872507
Change-Id: I20f9920e4a12511ce498c252bca955d82a4f4102

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index c4d978f..98fa897 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -4894,6 +4894,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());