commit 5d27fafdf03f259e92eaee9f6319b9349cc8d62e
author Ian Rogers <irogers@google.com> Fri May 02 17:17:18 2014 -0700
committer Ian Rogers <irogers@google.com> Fri May 02 23:30:03 2014 -0700
tree 53afb1174be2ae235e41c5ac9eeb1e8d67e3c4e1
parent a54c22c0041306f6881694f4c305e655b10e37be

Allow ArtMethod::Invoke in unstarted runtimes.

Change-Id: I0141f4daef4751589d03d27484eb65c811b14f27

runtime/class_linker.cc

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 703229c..db46224 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -3215,12 +3215,8 @@
   mirror::ArtMethod* clinit = klass->FindClassInitializer();
   if (clinit != NULL) {
     CHECK(can_init_statics);
-    if (LIKELY(Runtime::Current()->IsStarted())) {
-      JValue result;
-      clinit->Invoke(self, NULL, 0, &result, "V");
-    } else {
-      art::interpreter::EnterInterpreterFromInvoke(self, clinit, NULL, NULL, NULL);
-    }
+    JValue result;
+    clinit->Invoke(self, NULL, 0, &result, "V");
   }
 
   uint64_t t1 = NanoTime();