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/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 5507c36..bac39ef 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1173,7 +1173,10 @@
     if (klass != NULL) {
       if (klass->IsVerified()) {
         // Only try to initialize classes that were successfully verified.
-        class_linker->EnsureInitialized(klass, false);
+        bool compiling_boot = Runtime::Current()->GetHeap()->GetSpaces().size() == 1;
+        bool can_init_static_fields = compiling_boot &&
+            IsImageClass(descriptor);
+        class_linker->EnsureInitialized(klass, false, can_init_static_fields);
       }
       // record the final class status if necessary
       Class::Status status = klass->GetStatus();