commit 005ab2eb9e9ab4762c00e73c7028de2850bd5108
author Elliott Hughes <enh@google.com> Sun Sep 11 17:15:31 2011 -0700
committer Elliott Hughes <enh@google.com> Sun Sep 11 17:25:18 2011 -0700
tree a23c5792b8120afec5fc08f836e029aff4024629
parent b153906f2cd770ae460a480d3c9eb7ad421ff0ae

It's not an error to reenter InitializeClass.

OsConstants.<clinit> calls a native method that uses JNI to set fields.
This necessarily calls GetStaticFieldID, which entails a call to
ClassLinker::EnsureInitialized.

Change-Id: I8b3e2bdd927fd72c19fbee68f0ba511ad53887c0

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index a8281a3..570d797 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1179,7 +1179,9 @@
 
 bool ClassLinker::InitializeClass(Class* klass) {
   CHECK(klass->GetStatus() == Class::kStatusResolved ||
-      klass->GetStatus() == Class::kStatusError) << klass->GetStatus();
+      klass->GetStatus() == Class::kStatusInitializing ||
+      klass->GetStatus() == Class::kStatusError)
+          << PrettyDescriptor(klass->GetDescriptor()) << " is " << klass->GetStatus();
 
   Thread* self = Thread::Current();
 
@@ -1211,9 +1213,9 @@
     }
 
     while (klass->GetStatus() == Class::kStatusInitializing) {
-      // we caught somebody else in the act; was it us?
+      // We caught somebody else in the act; was it us?
       if (klass->GetClinitThreadId() == self->GetTid()) {
-        LG << "recursive <clinit>";
+        // Yes. That's fine.
         return true;
       }