From c42fab35f18539957debb8703195eeb76c9718f7 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 15 Aug 2017 14:11:49 +0000 Subject: Revert^2 "ART: Use proxy ArtMethod's data_ to store the interface method." Fix a DCHECK() to ignore unresolved proxy classes. Test: m test-art-host-gtest Test: testrunner.py --host Test: testrunner.py --host --jit Test: testrunner.py --host --gcstress This reverts commit 7ef52f75dd6e981e1e8c7567f593c197e8a94dcc. Change-Id: Idccdb04958a8bdb1c58b529dfb92885993ac62ea --- runtime/jit/jit_code_cache.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/jit/jit_code_cache.h') diff --git a/runtime/jit/jit_code_cache.h b/runtime/jit/jit_code_cache.h index daa1d616a6..9790e3aa43 100644 --- a/runtime/jit/jit_code_cache.h +++ b/runtime/jit/jit_code_cache.h @@ -323,7 +323,8 @@ class JitCodeCache { REQUIRES_SHARED(Locks::mutator_lock_); bool CheckLiveCompiledCodeHasProfilingInfo() - REQUIRES(lock_); + REQUIRES(lock_) + REQUIRES_SHARED(Locks::mutator_lock_); void FreeCode(uint8_t* code) REQUIRES(lock_); uint8_t* AllocateCode(size_t code_size) REQUIRES(lock_); -- cgit v1.2.3-59-g8ed1b