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

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index f75aeb7..794c6d2 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -198,16 +198,16 @@
     return image_classes.release();
   }
 
-  bool CreateOatFile(const std::string& boot_image_option,
-                     const std::string& host_prefix,
-                     const std::vector<const DexFile*>& dex_files,
-                     File* oat_file,
+  const Compiler* CreateOatFile(const std::string& boot_image_option,
+                                const std::string& host_prefix,
+                                const std::vector<const DexFile*>& dex_files,
+                                File* oat_file,
 #if defined(ART_USE_LLVM_COMPILER)
-                     std::string const& elf_filename,
-                     std::string const& bitcode_filename,
+                                std::string const& elf_filename,
+                                std::string const& bitcode_filename,
 #endif
-                     bool image,
-                     const std::set<std::string>* image_classes) {
+                                bool image,
+                                const std::set<std::string>* image_classes) {
     // SirtRef and ClassLoader creation needs to come after Runtime::Create
     UniquePtr<SirtRef<ClassLoader> > class_loader(new SirtRef<ClassLoader>(NULL));
     if (class_loader.get() == NULL) {
@@ -225,14 +225,18 @@
       class_loader.get()->reset(PathClassLoader::AllocCompileTime(class_path_files));
     }
 
-    Compiler compiler(instruction_set_, image, thread_count_, support_debugging_, image_classes);
+    UniquePtr<Compiler> compiler(new Compiler(instruction_set_,
+                                              image,
+                                              thread_count_,
+                                              support_debugging_,
+                                              image_classes));
 
 #if defined(ART_USE_LLVM_COMPILER)
-    compiler.SetElfFileName(elf_filename);
-    compiler.SetBitcodeFileName(bitcode_filename);
+    compiler->SetElfFileName(elf_filename);
+    compiler->SetBitcodeFileName(bitcode_filename);
 #endif
 
-    compiler.CompileAll(class_loader->get(), dex_files);
+    compiler->CompileAll(class_loader->get(), dex_files);
 
     std::string image_file_location;
     uint32_t image_file_location_checksum = 0;
@@ -251,20 +255,21 @@
                            dex_files,
                            image_file_location_checksum,
                            image_file_location,
-                           compiler)) {
+                           *compiler.get())) {
       LOG(ERROR) << "Failed to create oat file " << oat_file->name();
-      return false;
+      return NULL;
     }
-    return true;
+    return compiler.release();
   }
 
   bool CreateImageFile(const std::string& image_filename,
                        uintptr_t image_base,
                        const std::set<std::string>* image_classes,
                        const std::string& oat_filename,
-                       const std::string& oat_location) {
+                       const std::string& oat_location,
+                       const Compiler& compiler) {
     ImageWriter image_writer(image_classes);
-    if (!image_writer.Write(image_filename, image_base, oat_filename, oat_location)) {
+    if (!image_writer.Write(image_filename, image_base, oat_filename, oat_location, compiler)) {
       LOG(ERROR) << "Failed to create image file " << image_filename;
       return false;
     }
@@ -704,16 +709,18 @@
     }
   }
 
-  if (!dex2oat->CreateOatFile(boot_image_option,
-                              host_prefix,
-                              dex_files,
-                              oat_file.get(),
+  UniquePtr<const Compiler> compiler(dex2oat->CreateOatFile(boot_image_option,
+                                                            host_prefix,
+                                                            dex_files,
+                                                            oat_file.get(),
 #if defined(ART_USE_LLVM_COMPILER)
-                              elf_filename,
-                              bitcode_filename,
+                                                            elf_filename,
+                                                            bitcode_filename,
 #endif
-                              image,
-                              image_classes.get())) {
+                                                            image,
+                                                            image_classes.get()));
+
+  if (compiler.get() == NULL) {
     LOG(ERROR) << "Failed to create oat file: " << oat_location;
     return EXIT_FAILURE;
   }
@@ -730,7 +737,8 @@
                                 image_base,
                                 image_classes.get(),
                                 oat_filename,
-                                oat_location)) {
+                                oat_location,
+                                *compiler.get())) {
     return EXIT_FAILURE;
   }