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

diff --git a/src/thread.cc b/src/thread.cc
index c4934b0..5233dd1 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -244,14 +244,14 @@
 }
 
 Object* Thread::GetMainThreadGroup() {
-  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(gThreadGroup, true)) {
+  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(gThreadGroup, true, true)) {
     return NULL;
   }
   return gThreadGroup_mMain->GetObject(NULL);
 }
 
 Object* Thread::GetSystemThreadGroup() {
-  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(gThreadGroup, true)) {
+  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(gThreadGroup, true, true)) {
     return NULL;
   }
   return gThreadGroup_mSystem->GetObject(NULL);