From 76ccd09c3d98317dfbd179c6f5c231dcfc5d6996 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 15 Aug 2017 19:11:54 +0000 Subject: Revert^3 "ART: Use proxy ArtMethod's data_ to store the interface method."" Still failling: +dalvikvm64 F 08-15 18:54:16 218912 218912 art_method-inl.h:395] Check failed: !GetDeclaringClass()->IsResolved() || interface_method->GetDeclaringClass()->IsAssignableFrom(GetDeclaringClass()) This reverts commit c42fab35f18539957debb8703195eeb76c9718f7. Change-Id: I91b51f8c1e7f6e0ae876b751d8e9cd3b8acb62f6 --- runtime/jit/jit_code_cache.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (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 9790e3aa43..daa1d616a6 100644 --- a/runtime/jit/jit_code_cache.h +++ b/runtime/jit/jit_code_cache.h @@ -323,8 +323,7 @@ class JitCodeCache { REQUIRES_SHARED(Locks::mutator_lock_); bool CheckLiveCompiledCodeHasProfilingInfo() - REQUIRES(lock_) - REQUIRES_SHARED(Locks::mutator_lock_); + REQUIRES(lock_); void FreeCode(uint8_t* code) REQUIRES(lock_); uint8_t* AllocateCode(size_t code_size) REQUIRES(lock_); -- cgit v1.2.3-59-g8ed1b