commit 1afdfe681436db495276d853709116c39de40c4d
author Nicolas Geoffray <ngeoffray@google.com> Wed Nov 21 09:38:10 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Nov 22 08:58:15 2018 +0000
tree a2fe476efb313455090b419b7a83971b7f5ec29f
parent d52a6f402fac600e7432cfd59a1298659625a6d3

Wait until inline cache is accessible in GetProfiledMethods.

Bug: 119844538
Test: test.py
Change-Id: I7ee0718bb866652b1913496eb3ecd3beee1d46c3

runtime/jit/jit_code_cache.cc

diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc
index 1701ca8..0bdb0c9 100644
--- a/runtime/jit/jit_code_cache.cc
+++ b/runtime/jit/jit_code_cache.cc
@@ -1806,8 +1806,10 @@
 
 void JitCodeCache::GetProfiledMethods(const std::set<std::string>& dex_base_locations,
                                       std::vector<ProfileMethodInfo>& methods) {
+  Thread* self = Thread::Current();
+  WaitUntilInlineCacheAccessible(self);
+  MutexLock mu(self, lock_);
   ScopedTrace trace(__FUNCTION__);
-  MutexLock mu(Thread::Current(), lock_);
   uint16_t jit_compile_threshold = Runtime::Current()->GetJITOptions()->GetCompileThreshold();
   for (const ProfilingInfo* info : profiling_infos_) {
     ArtMethod* method = info->GetMethod();