commit e22aa32240589cf31d341e0f59bf0bf522b4a239
author Nicolas Geoffray <ngeoffray@google.com> Fri Aug 05 12:32:31 2022 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Aug 09 15:02:24 2022 +0000
tree 38d19747a3c0957546d38036eca59ccfceaaac79
parent e9142f27e405580e76c077ac7d249373487d7753

Reland^2 "Use the thread local cache in interpreter / unresolved entrypoints"

This reverts commit 93d6dcb6972185c82db5b87d1648380968736f1a.

Bug: b/240233684

Reason for revert: Fixed invokeinterface

Change-Id: I135d35de43a9a7ba2e4f2d636c1b24ea88375172

runtime/interpreter/mterp/nterp.cc

diff --git a/runtime/interpreter/mterp/nterp.cc b/runtime/interpreter/mterp/nterp.cc
index be1d229..5922efd 100644
--- a/runtime/interpreter/mterp/nterp.cc
+++ b/runtime/interpreter/mterp/nterp.cc
@@ -26,7 +26,6 @@
 #include "entrypoints/entrypoint_utils-inl.h"
 #include "interpreter/interpreter_cache-inl.h"
 #include "interpreter/interpreter_common.h"
-#include "interpreter/interpreter_intrinsics.h"
 #include "interpreter/shadow_frame-inl.h"
 #include "mirror/string-alloc-inl.h"
 #include "nterp_helpers.h"
@@ -96,13 +95,12 @@
 }
 
 template<typename T>
-inline void UpdateCache(Thread* self, uint16_t* dex_pc_ptr, T value) {
-  DCHECK(kUseReadBarrier) << "Nterp only works with read barriers";
+inline void UpdateCache(Thread* self, const uint16_t* dex_pc_ptr, T value) {
   self->GetInterpreterCache()->Set(self, dex_pc_ptr, value);
 }
 
 template<typename T>
-inline void UpdateCache(Thread* self, uint16_t* dex_pc_ptr, T* value) {
+inline void UpdateCache(Thread* self, const uint16_t* dex_pc_ptr, T* value) {
   UpdateCache(self, dex_pc_ptr, reinterpret_cast<size_t>(value));
 }
 
@@ -252,7 +250,7 @@
 }
 
 FLATTEN
-extern "C" size_t NterpGetMethod(Thread* self, ArtMethod* caller, uint16_t* dex_pc_ptr)
+extern "C" size_t NterpGetMethod(Thread* self, ArtMethod* caller, const uint16_t* dex_pc_ptr)
     REQUIRES_SHARED(Locks::mutator_lock_) {
   UpdateHotness(caller);
   const Instruction* inst = Instruction::At(dex_pc_ptr);