From 336a1845af10f9f3ad7c9f7f8e1ae21bb7a03cd5 Mon Sep 17 00:00:00 2001
From: Almaz Mingaleev <mingaleev@google.com>
Date: Mon, 10 Mar 2025 07:49:20 -0700
Subject: 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
---
 runtime/class_linker.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'runtime/class_linker.cc')

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);
 }
 
-- 
cgit v1.2.3-59-g8ed1b