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
---
 compiler/optimizing/instruction_builder.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc
index ba426b5694..c8086cff99 100644
--- a/compiler/optimizing/instruction_builder.cc
+++ b/compiler/optimizing/instruction_builder.cc
@@ -1634,7 +1634,7 @@ static bool HasTrivialClinit(ObjPtr<mirror::Class> klass, PointerSize pointer_si
     REQUIRES_SHARED(Locks::mutator_lock_) {
   // Check if the class has encoded fields that trigger bytecode execution.
   // (Encoded fields are just a different representation of <clinit>.)
-  if (klass->NumStaticFields() != 0u) {
+  if (klass->HasStaticFields()) {
     DCHECK(klass->GetClassDef() != nullptr);
     EncodedStaticFieldValueIterator it(klass->GetDexFile(), *klass->GetClassDef());
     for (; it.HasNext(); it.Next()) {
-- 
cgit v1.2.3-59-g8ed1b