commit 0045a290e6b79a274250e3112880c04bde437d4a
author Ian Rogers <irogers@google.com> Sat Mar 31 21:08:41 2012 -0700
committer Ian Rogers <irogers@google.com> Sat Mar 31 22:38:22 2012 -0700
tree a125d556b6c817218b14f6f3f72079b83d0032c4
parent d23f5206cf72ca3fb53ac3049649bb7d018232bf

Avoid a case of eager initialization.

Don't mark as initialized classes that contain static field
initialization.

Change-Id: Iedcabbdf355e8861eb7731650eee1467f68ae0cd

src/class_linker.h

diff --git a/src/class_linker.h b/src/class_linker.h
index eb76738..3226a6f 100644
--- a/src/class_linker.h
+++ b/src/class_linker.h
@@ -222,7 +222,7 @@
   // Returns true on success, false if there's an exception pending.
   // can_run_clinit=false allows the compiler to attempt to init a class,
   // given the restriction that no <clinit> execution is possible.
-  bool EnsureInitialized(Class* c, bool can_run_clinit);
+  bool EnsureInitialized(Class* c, bool can_run_clinit, bool can_init_fields);
 
   // Initializes classes that have instances in the image but that have
   // <clinit> methods so they could not be initialized by the compiler.
@@ -365,11 +365,12 @@
   bool IsDexFileRegisteredLocked(const DexFile& dex_file) const;
   void RegisterOatFileLocked(const OatFile& oat_file);
 
-  bool InitializeClass(Class* klass, bool can_run_clinit);
+  bool InitializeClass(Class* klass, bool can_run_clinit, bool can_init_statics);
   bool WaitForInitializeClass(Class* klass, Thread* self, ObjectLock& lock);
   bool ValidateSuperClassDescriptors(const Class* klass);
-  bool InitializeSuperClass(Class* klass, bool can_run_clinit);
-  void InitializeStaticFields(Class* klass);
+  bool InitializeSuperClass(Class* klass, bool can_run_clinit, bool can_init_fields);
+  // Initialize static fields, returns true if fields were initialized.
+  bool InitializeStaticFields(Class* klass);
 
   bool IsSameDescriptorInDifferentClassContexts(const char* descriptor,
                                                 const Class* klass1,