diff options
| author | 2025-03-10 07:49:20 -0700 | |
|---|---|---|
| committer | 2025-03-10 09:26:04 -0700 | |
| commit | 336a1845af10f9f3ad7c9f7f8e1ae21bb7a03cd5 (patch) | |
| tree | 021ed3415ad8b8535a3b356f088f0d37944b386a /runtime/class_linker.cc | |
| parent | ee8ab3125768bbf60347c507103a910553acd158 (diff) | |
Revert "Call target method in accessor MHs when it is set."
Revert submission 3382609-target-accessors
Reason for revert: x86.poison.64 failures on LUCI
Reverted changes: /q/submissionid:3382609-target-accessors
Change-Id: I384945809bc18ac4dfc937af088c7dbe30ac5c5c
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 009d705caf..70eea2d268 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -10569,7 +10569,7 @@ ObjPtr<mirror::MethodHandle> ClassLinker::ResolveMethodHandleForField( return nullptr; } - StackHandleScope<5> hs(self); + StackHandleScope<4> hs(self); ObjPtr<mirror::Class> array_of_class = GetClassRoot<mirror::ObjectArray<mirror::Class>>(this); Handle<mirror::ObjectArray<mirror::Class>> method_params(hs.NewHandle( mirror::ObjectArray<mirror::Class>::Alloc(self, array_of_class, num_params))); @@ -10629,8 +10629,7 @@ ObjPtr<mirror::MethodHandle> ClassLinker::ResolveMethodHandleForField( return nullptr; } - Handle<mirror::Field> target(hs.NewHandle( - mirror::Field::CreateFromArtField(self, target_field, /*force_resolve=*/ true))); + uintptr_t target = reinterpret_cast<uintptr_t>(target_field); return mirror::MethodHandleImpl::Create(self, target, kind, method_type); } |