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

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 0ee9990..7b907ae 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -229,7 +229,7 @@
         // we'd still be waiting for the lock.
         if (fields_class->IsInitializing()) {
           return resolved_field;
-        } else if (Runtime::Current()->GetClassLinker()->EnsureInitialized(fields_class, true)) {
+        } else if (Runtime::Current()->GetClassLinker()->EnsureInitialized(fields_class, true, true)) {
           return resolved_field;
         } else {
           DCHECK(self->IsExceptionPending());  // Throw exception and unwind
@@ -367,7 +367,7 @@
   if (klass == referring_class && MethodHelper(referrer).IsClassInitializer()) {
     return klass;
   }
-  if (!class_linker->EnsureInitialized(klass, true)) {
+  if (!class_linker->EnsureInitialized(klass, true, true)) {
     CHECK(self->IsExceptionPending());
     return NULL;  // Failure - Indicate to caller to deliver exception
   }