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/gc/heap-inl.h

diff --git a/runtime/gc/heap-inl.h b/runtime/gc/heap-inl.h
index 6aed61a..b0ca18e 100644
--- a/runtime/gc/heap-inl.h
+++ b/runtime/gc/heap-inl.h
@@ -49,6 +49,7 @@
     // done in the runnable state where suspension is expected.
     CHECK_EQ(self->GetState(), kRunnable);
     self->AssertThreadSuspensionIsAllowable();
+    self->AssertNoPendingException();
   }
   // Need to check that we arent the large object allocator since the large object allocation code
   // path this function. If we didn't check we would have an infinite loop.