commit f867b6f706818c886087f61b89d1e8f5fc4653cf
author Brian Carlstrom <bdc@google.com> Fri Sep 16 12:17:25 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Sep 16 23:18:48 2011 -0700
tree 87a87a20f884601848ad09ced087035d121ab2d0
parent 6bdc3b255d313a71016e78802dbcc97fa995c851

Filling in some Class, Method, and Field native code needed during startup and I/O

Change-Id: Ia2f2a0ec295d1bd848e6f65254bd9fec2fde56f6

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index e0a0b20..b9120fa 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -361,9 +361,20 @@
   // Finish attaching the main thread.
   Thread::Current()->CreatePeer("main", false);
 
+  RunImageClinits();
+
   StartDaemonThreads();
 }
 
+// initialize classes that have instances in the image but that have
+// <clinit> methods so they could not be initialized by the compiler.
+void Runtime::RunImageClinits() {
+  Class* Field_class = class_linker_->FindSystemClass("Ljava/lang/reflect/Field;");
+  CHECK(Field_class->FindDeclaredDirectMethod("<clinit>", "()V") != NULL);
+  class_linker_->EnsureInitialized(Field_class);
+  CHECK(!Thread::Current()->IsExceptionPending());
+}
+
 void Runtime::StartDaemonThreads() {
   signal_catcher_ = new SignalCatcher;
 
@@ -372,8 +383,6 @@
   Method* m = c->FindDirectMethod("start", "()V");
   CHECK(m != NULL);
 //  m->Invoke(Thread::Current(), NULL, NULL, NULL);
-
-  signal_catcher_->HandleSigQuit();
 }
 
 bool Runtime::IsStarted() {
@@ -458,8 +467,8 @@
   //REGISTER(register_java_lang_reflect_AccessibleObject);
   //REGISTER(register_java_lang_reflect_Array);
   //REGISTER(register_java_lang_reflect_Constructor);
-  //REGISTER(register_java_lang_reflect_Field);
-  //REGISTER(register_java_lang_reflect_Method);
+  REGISTER(register_java_lang_reflect_Field);
+  REGISTER(register_java_lang_reflect_Method);
   //REGISTER(register_java_lang_reflect_Proxy);
   REGISTER(register_java_util_concurrent_atomic_AtomicLong);
   //REGISTER(register_org_apache_harmony_dalvik_ddmc_DdmServer);