commit 5ce38c9a112ecc8686f31adc5d5fc8386616b196
author Vladimir Marko <vmarko@google.com> Wed Mar 08 17:21:09 2023 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 13 08:45:16 2023 +0000
tree faf0fb8eb719494a725c0ca31788b57d0b71efec
parent 4fa108f80bc46e2058deaf542e01c794b09d5b10

Rename arrays in `ClassLinker::RunRootClinits()`.

Remove misleading "static" from their names.

Test: Presubmit
Change-Id: I5b155570bdfe043f2822e0c8b50ea9acdd2f162e

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 224b928..314ba40 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1134,7 +1134,7 @@
   // classes are always in the boot image, so this code is primarily intended
   // for running without boot image but may be needed for boot image if the
   // AOT-initialization fails due to introduction of new code to `<clinit>`.
-  ArtMethod* static_methods_of_classes_to_initialize[] = {
+  ArtMethod* methods_of_classes_to_initialize[] = {
       // Initialize primitive boxing classes (avoid check at runtime).
       WellKnownClasses::java_lang_Boolean_valueOf,
       WellKnownClasses::java_lang_Byte_valueOf,
@@ -1179,10 +1179,10 @@
       // suppress class initialization error (say, due to OOM), so initialize it early.
       WellKnownClasses::org_apache_harmony_dalvik_ddmc_DdmServer_dispatch,
   };
-  for (ArtMethod* method : static_methods_of_classes_to_initialize) {
+  for (ArtMethod* method : methods_of_classes_to_initialize) {
     EnsureRootInitialized(this, self, method->GetDeclaringClass());
   }
-  ArtField* static_fields_of_classes_to_initialize[] = {
+  ArtField* fields_of_classes_to_initialize[] = {
       // Ensure classes used by class loaders are initialized (avoid check at runtime).
       WellKnownClasses::dalvik_system_DexFile_cookie,
       WellKnownClasses::dalvik_system_DexPathList_dexElements,
@@ -1193,7 +1193,7 @@
       WellKnownClasses::java_util_Collections_EMPTY_LIST,
       WellKnownClasses::libcore_util_EmptyArray_STACK_TRACE_ELEMENT,
   };
-  for (ArtField* field : static_fields_of_classes_to_initialize) {
+  for (ArtField* field : fields_of_classes_to_initialize) {
     EnsureRootInitialized(this, self, field->GetDeclaringClass());
   }
 }