diff options
| author | 2024-09-11 16:38:34 +0000 | |
|---|---|---|
| committer | 2024-09-12 07:41:23 +0000 | |
| commit | 956fbc47a697f893c0311606c283b6d6672c01c2 (patch) | |
| tree | fd8eb0411255e1c015d77eb8212b24b997b3544f | |
| parent | 7c6f2ee63a8cdb5fc543a36309458e5749d66435 (diff) | |
Change arguments order in VarHandles::VarHandleInvokeAccessor.
Make it consistent with other methods.
Bug: 297147201
Test: ./art/test/testrunner/testrunner.py --host --64 --no-image --no-relocate --prebuild -b
Change-Id: Iead98dbb33aa24c0f53a3dfb6c4c59c9a91c3a14
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 2 | ||||
| -rw-r--r-- | runtime/interpreter/interpreter_common.cc | 2 | ||||
| -rw-r--r-- | runtime/var_handles.cc | 2 | ||||
| -rw-r--r-- | runtime/var_handles.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index cf4ba6e5b7..99390f1b3e 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -2448,8 +2448,8 @@ extern "C" uint64_t artInvokePolymorphic(mirror::Object* raw_receiver, Thread* s success = VarHandleInvokeAccessor(self, *shadow_frame, - caller_method, var_handle, + caller_method, proto_idx, access_mode, &operands, diff --git a/runtime/interpreter/interpreter_common.cc b/runtime/interpreter/interpreter_common.cc index fa0051c0b4..f530fa245d 100644 --- a/runtime/interpreter/interpreter_common.cc +++ b/runtime/interpreter/interpreter_common.cc @@ -459,8 +459,8 @@ static bool DoVarHandleInvokeCommon(Thread* self, return VarHandleInvokeAccessor(self, shadow_frame, - method, var_handle, + method, dex::ProtoIndex(vRegH), access_mode, &operands, diff --git a/runtime/var_handles.cc b/runtime/var_handles.cc index d2cc564c66..6040ab303e 100644 --- a/runtime/var_handles.cc +++ b/runtime/var_handles.cc @@ -158,8 +158,8 @@ bool VarHandleInvokeAccessor(Thread* self, bool VarHandleInvokeAccessor(Thread* self, ShadowFrame& shadow_frame, - ArtMethod* caller_method, Handle<mirror::VarHandle> var_handle, + ArtMethod* caller_method, const dex::ProtoIndex callsite_type_id, const mirror::VarHandle::AccessMode access_mode, const InstructionOperands* const operands, diff --git a/runtime/var_handles.h b/runtime/var_handles.h index acaa6e3cee..d056d16ab6 100644 --- a/runtime/var_handles.h +++ b/runtime/var_handles.h @@ -50,8 +50,8 @@ bool VarHandleInvokeAccessor(Thread* self, bool VarHandleInvokeAccessor(Thread* self, ShadowFrame& shadow_frame, - ArtMethod* caller_method, Handle<mirror::VarHandle> var_handle, + ArtMethod* caller_method, const dex::ProtoIndex callsite_type, const mirror::VarHandle::AccessMode access_mode, const InstructionOperands* const operands, |