From 990cf07523a5c6ae437a0bd0cc80fb63320def5e Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 28 Nov 2024 16:28:04 +0000
Subject: Merge sFields and iFields.

Test: test.py

Change-Id: Ib97fca637a8866a41a4389b150c6000d9fb6d99b
---
 runtime/gc/reference_processor.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime/gc/reference_processor.cc')

diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc
index cb777c895c..c799f5443b 100644
--- a/runtime/gc/reference_processor.cc
+++ b/runtime/gc/reference_processor.cc
@@ -54,8 +54,8 @@ ReferenceProcessor::ReferenceProcessor()
 static inline MemberOffset GetSlowPathFlagOffset(ObjPtr<mirror::Class> reference_class)
     REQUIRES_SHARED(Locks::mutator_lock_) {
   DCHECK(reference_class == GetClassRoot<mirror::Reference>());
-  // Second static field
-  ArtField* field = reference_class->GetStaticField(1);
+  ArtField* field = reference_class->GetField(reference_class->NumFields() - 1);
+  DCHECK(field->IsStatic());
   DCHECK_STREQ(field->GetName(), "slowPathEnabled");
   return field->GetOffset();
 }
-- 
cgit v1.2.3-59-g8ed1b