commit 085f7408de57fedac4ec95d5b5e8b4fe809dbeba
author Nicolas Geoffray <ngeoffray@google.com> Mon Dec 16 16:30:48 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Dec 16 17:53:01 2019 +0000
tree 108393c6fc6d2fa0ed27f6b299b993889a43fe40
parent 0d38e8587c014e600bc6ee916aa15912c0ef190d

Re-arrange code to avoid recursive locking of the JIT lock.

Creating a profiling info requires the lock, so don't hold it before
calling ProfilingInfo::Create.

Test: test.py
Change-Id: Ib217052c09274665cbfa7572540ee391858dd342

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 945600a..299a3d3 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -1616,12 +1616,15 @@
     }
   }
 
-  MutexLock mu(self, *Locks::jit_lock_);
-  if (osr && (osr_code_map_.find(method) != osr_code_map_.end())) {
-    return false;
+  if (osr) {
+    MutexLock mu(self, *Locks::jit_lock_);
+    if (osr_code_map_.find(method) != osr_code_map_.end()) {
+      return false;
+    }
   }
 
   if (UNLIKELY(method->IsNative())) {
+    MutexLock mu(self, *Locks::jit_lock_);
     JniStubKey key(method);
     auto it = jni_stubs_map_.find(key);
     bool new_compilation = false;
@@ -1666,6 +1669,7 @@
         return false;
       }
     } else {
+      MutexLock mu(self, *Locks::jit_lock_);
       if (info->IsMethodBeingCompiled(osr)) {
         return false;
       }