commit f582258f0e296223a091fd64231a203ad71e9649
author Brian Carlstrom <bdc@google.com> Mon Mar 19 22:34:31 2012 -0700
committer Brian Carlstrom <bdc@google.com> Mon Mar 19 22:59:13 2012 -0700
tree 23049122f075220421803a1745cf634337360a40
parent a7c12688da57ea052e127776ad3043ca5079488d

oat file patching

Change-Id: Idbbdf19f3a77498d79d043fd33ca12ce39cafbb7

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index f15d46f..c65cf7d 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1339,9 +1339,6 @@
 
 const OatFile::OatClass* ClassLinker::GetOatClass(const DexFile& dex_file, const char* descriptor) {
   DCHECK(descriptor != NULL);
-  if (!Runtime::Current()->IsStarted() || Runtime::Current()->UseCompileTimeClassPath()) {
-    return NULL;
-  }
   const OatFile* oat_file = FindOpenedOatFileForDexFile(dex_file);
   CHECK(oat_file != NULL) << dex_file.GetLocation() << " " << descriptor;
   const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file.GetLocation());
@@ -1354,9 +1351,9 @@
   return oat_class;
 }
 
+// Special case to get oat code without overwriting a trampoline.
 const void* ClassLinker::GetOatCodeFor(const Method* method) {
-  // Special case to get oat code without overwriting a trampoline.
-  CHECK(method->GetDeclaringClass()->IsInitializing());
+  CHECK(Runtime::Current()->IsCompiler() || method->GetDeclaringClass()->IsInitializing());
   // Although we overwrite the trampoline of non-static methods, we may get here via the resolution
   // method for direct methods (or virtual methods made direct).
   Class* declaring_class = method->GetDeclaringClass();
@@ -1381,6 +1378,7 @@
   }
   ClassHelper kh(declaring_class);
   UniquePtr<const OatFile::OatClass> oat_class(GetOatClass(kh.GetDexFile(), kh.GetDescriptor()));
+  CHECK(oat_class.get() != NULL);
   return oat_class->GetOatMethod(oat_method_index).GetCode();
 }
 
@@ -1393,11 +1391,12 @@
   if (class_data == NULL) {
     return;  // no fields or methods - for example a marker interface
   }
-  UniquePtr<const OatFile::OatClass> oat_class(GetOatClass(dex_file, kh.GetDescriptor()));
-  if (oat_class.get() == NULL) {
+  if (!Runtime::Current()->IsStarted() || Runtime::Current()->UseCompileTimeClassPath()) {
     // OAT file unavailable
     return;
   }
+  UniquePtr<const OatFile::OatClass> oat_class(GetOatClass(dex_file, kh.GetDescriptor()));
+  CHECK(oat_class.get() != NULL);
   ClassDataItemIterator it(dex_file, class_data);
   // Skip fields
   while (it.HasNextStaticField()) {
@@ -1499,7 +1498,10 @@
     LoadField(dex_file, it, klass, ifield);
   }
 
-  UniquePtr<const OatFile::OatClass> oat_class(GetOatClass(dex_file, descriptor));
+  UniquePtr<const OatFile::OatClass> oat_class;
+  if (Runtime::Current()->IsStarted() && !Runtime::Current()->UseCompileTimeClassPath()) {
+    oat_class.reset(GetOatClass(dex_file, descriptor));
+  }
 
   // Load methods.
   if (it.NumDirectMethods() != 0) {