From b30c5a0d84cd03ae465bda61ee41ddaec326b9d5 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Tue, 21 Jan 2025 11:47:52 +0000
Subject: Add new WellKnownClasses fields to avoid harcoded constants.

Test: test.py
Change-Id: I3a065dd5582269792032df0c6446c3c4b6cd72be
---
 compiler/optimizing/instruction_simplifier.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'compiler/optimizing/instruction_simplifier.cc')

diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc
index 101808a193..26efefa2d8 100644
--- a/compiler/optimizing/instruction_simplifier.cc
+++ b/compiler/optimizing/instruction_simplifier.cc
@@ -1800,8 +1800,7 @@ static bool RecognizeAndSimplifyClassCheck(HCondition* condition) {
 
   {
     ScopedObjectAccess soa(Thread::Current());
-    ArtField* field = GetClassRoot<mirror::Object>()->GetField(0);
-    DCHECK_EQ(std::string(field->GetName()), "shadow$_klass_");
+    ArtField* field = WellKnownClasses::java_lang_Object_shadowKlass;
     if (field_get->GetFieldInfo().GetField() != field) {
       return false;
     }
-- 
cgit v1.2.3-59-g8ed1b