commit 3fa13791c51985d9956d01bc465de6d36c3390d3
author Ian Rogers <irogers@google.com> Sun Mar 18 15:53:45 2012 -0700
committer Ian Rogers <irogers@google.com> Sun Mar 18 15:55:17 2012 -0700
tree b7c5e7a8e3462edd64e141e9de9f3e170333748d
parent 10fa929276fc069f882783174fda7af8194d41cf

Patch support for the boot image.

Requires oat and image writer support.

Change-Id: Ic87dd481a4f86d15faa1e830ea1dd0b3d664c220

src/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 5156122..6a65b69 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -696,10 +696,6 @@
   if (sharp_type != kStatic && sharp_type != kDirect) {
     return;
   }
-  bool compiling_boot = Runtime::Current()->GetHeap()->GetSpaces().size() == 1;
-  if (compiling_boot) {
-    return;
-  }
   bool method_code_in_boot = method->GetDeclaringClass()->GetClassLoader() == NULL;
   if (!method_code_in_boot) {
     return;
@@ -710,10 +706,22 @@
   }
   stats_->DirectCallsToBoot(type);
   stats_->DirectMethodsToBoot(type);
-  if (Runtime::Current()->GetHeap()->GetImageSpace()->Contains(method)) {
-    direct_method = reinterpret_cast<uintptr_t>(method);
+  bool compiling_boot = Runtime::Current()->GetHeap()->GetSpaces().size() == 1;
+  if (compiling_boot) {
+    const bool kSupportBootImageFixup = false;
+    if (kSupportBootImageFixup) {
+      MethodHelper mh(method);
+      if (IsImageClass(mh.GetDeclaringClassDescriptor())) {
+        direct_method = -1;
+      }
+      direct_code = -1;
+    }
+  } else {
+    if (Runtime::Current()->GetHeap()->GetImageSpace()->Contains(method)) {
+      direct_method = reinterpret_cast<uintptr_t>(method);
+    }
+    direct_code = reinterpret_cast<uintptr_t>(method->GetCode());
   }
-  direct_code = reinterpret_cast<uintptr_t>(method->GetCode());
 }
 
 bool Compiler::ComputeInvokeInfo(uint32_t method_idx, OatCompilationUnit* mUnit, InvokeType& type,
@@ -785,6 +793,21 @@
   return false;  // Incomplete knowledge needs slow path.
 }
 
+void Compiler::AddCodePatch(DexCache* dex_cache, const DexFile* dex_file,
+                            uint32_t referrer_method_idx, uint32_t target_method_idx,
+                            size_t literal_offset) {
+  MutexLock mu(compiled_methods_lock_);
+  code_to_patch_.push_back(new PatchInformation(dex_cache, dex_file, referrer_method_idx,
+                                                target_method_idx, literal_offset));
+}
+void Compiler::AddMethodPatch(DexCache* dex_cache, const DexFile* dex_file,
+                              uint32_t referrer_method_idx, uint32_t target_method_idx,
+                              size_t literal_offset) {
+  MutexLock mu(compiled_methods_lock_);
+  methods_to_patch_.push_back(new PatchInformation(dex_cache, dex_file, referrer_method_idx,
+                                                   target_method_idx, literal_offset));
+}
+
 // Return true if the class should be skipped during compilation. We
 // never skip classes in the boot class loader. However, if we have a
 // non-boot class loader and we can resolve the class in the boot