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/compiler.cc

diff --git a/src/compiler.cc b/src/compiler.cc
index 6a65b69..f066b0a 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -355,6 +355,14 @@
     MutexLock mu(compiled_invoke_stubs_lock_);
     STLDeleteValues(&compiled_invoke_stubs_);
   }
+  {
+    MutexLock mu(compiled_methods_lock_);
+    STLDeleteElements(&code_to_patch_);
+  }
+  {
+    MutexLock mu(compiled_methods_lock_);
+    STLDeleteElements(&methods_to_patch_);
+  }
 #if defined(ART_USE_LLVM_COMPILER)
   CompilerCallbackFn f = FindFunction<CompilerCallbackFn>(MakeCompilerSoName(instruction_set_),
                                                           compiler_library_,
@@ -793,19 +801,37 @@
   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,
+void Compiler::AddCodePatch(DexCache* dex_cache,
+                            const DexFile* dex_file,
+                            uint32_t referrer_method_idx,
+                            uint32_t referrer_access_flags,
+                            uint32_t target_method_idx,
+                            bool target_is_direct,
                             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));
+  code_to_patch_.push_back(new PatchInformation(dex_cache,
+                                                dex_file,
+                                                referrer_method_idx,
+                                                referrer_access_flags,
+                                                target_method_idx,
+                                                target_is_direct,
+                                                literal_offset));
 }
-void Compiler::AddMethodPatch(DexCache* dex_cache, const DexFile* dex_file,
-                              uint32_t referrer_method_idx, uint32_t target_method_idx,
+void Compiler::AddMethodPatch(DexCache* dex_cache,
+                              const DexFile* dex_file,
+                              uint32_t referrer_method_idx,
+                              uint32_t referrer_access_flags,
+                              uint32_t target_method_idx,
+                              bool target_is_direct,
                               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));
+  methods_to_patch_.push_back(new PatchInformation(dex_cache,
+                                                   dex_file,
+                                                   referrer_method_idx,
+                                                   referrer_access_flags,
+                                                   target_method_idx,
+                                                   target_is_direct,
+                                                   literal_offset));
 }
 
 // Return true if the class should be skipped during compilation. We