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/runtime_support.h

diff --git a/src/runtime_support.h b/src/runtime_support.h
index 2f5ba5b..0229bc1 100644
--- a/src/runtime_support.h
+++ b/src/runtime_support.h
@@ -87,7 +87,7 @@
       return NULL;  // Failure
     }
   }
-  if (!runtime->GetClassLinker()->EnsureInitialized(klass, true)) {
+  if (!runtime->GetClassLinker()->EnsureInitialized(klass, true, true)) {
     DCHECK(self->IsExceptionPending());
     return NULL;  // Failure
   }