commit 5f4a09a54eed55de89e194780214a2acfd2cb431
author Andreas Gampe <agampe@google.com> Mon Sep 28 13:16:33 2015 -0700
committer Andreas Gampe <agampe@google.com> Mon Oct 05 08:57:32 2015 -0700
tree 20194da9f2963a98f0265a25172aa9a61b52c2c8
parent 1aba494df441c31836e5b7d4d8e408420a93cb8d

ART: Add CheckJNI lock checking

JNI MonitorEnter and MonitorExit have similar rules to structured
locking. Count locks in CheckJNI mode.

Bug: 23502994
Change-Id: Ie3f53d3aa669a6bd0c7153c50c168116b43764d9

runtime/entrypoints/quick/quick_jni_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
index fc5c52e..58f256a 100644
--- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
@@ -65,6 +65,9 @@
 static void PopLocalReferences(uint32_t saved_local_ref_cookie, Thread* self)
     SHARED_REQUIRES(Locks::mutator_lock_) {
   JNIEnvExt* env = self->GetJniEnv();
+  if (UNLIKELY(env->check_jni)) {
+    env->CheckNoHeldMonitors();
+  }
   env->locals.SetSegmentState(env->local_ref_cookie);
   env->local_ref_cookie = saved_local_ref_cookie;
   self->PopHandleScope();