commit b1bab1c9e40ff9049f57f09a876ac77b44517144
author Logan Chien <loganchien@google.com> Fri May 11 11:05:45 2012 +0800
committer Shih-wei Liao <sliao@google.com> Tue May 15 02:29:51 2012 -0700
tree 530ac235980d51562ffdc02be53556b836d182aa
parent 7834cbd5d8a0e61db14339910d2223a3e59d7efc

Code cleanup: Remove unnecessary parameter.

Change-Id: I978ba7857be99af643cf5377029662b056431e3c

src/compiler_llvm/compilation_unit.cc

diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index fbd2f05..30c6aa1 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -207,7 +207,7 @@
 
   if (thread_count == 1) {
     llvm::raw_string_ostream str_os(elf_image_);
-    bool success = MaterializeToFile(str_os, insn_set_);
+    bool success = MaterializeToFile(str_os);
     LOG(INFO) << "Compilation Unit: " << elf_idx_ << (success ? " (done)" : " (failed)");
 
     // Free the resources
@@ -244,7 +244,7 @@
 
     // TODO: Should use exec* family instead of invoking a function.
     // Forward our compilation request to bcc.
-    exit(static_cast<int>(!MaterializeToFile(fd_os, insn_set_)));
+    exit(static_cast<int>(!MaterializeToFile(fd_os)));
 
   } else { // Parent process
     // Close the unused pipe write end
@@ -325,19 +325,12 @@
   }
 }
 
-bool CompilationUnit::MaterializeToFile(llvm::raw_ostream& out_stream,
-                                        InstructionSet insn_set) {
-  // Initialize the LLVM first
-  llvm::InitializeAllTargets();
-  llvm::InitializeAllTargetMCs();
-  llvm::InitializeAllAsmPrinters();
-  llvm::InitializeAllAsmParsers();
-
+bool CompilationUnit::MaterializeToFile(llvm::raw_ostream& out_stream) {
   // Lookup the LLVM target
   char const* target_triple = NULL;
   char const* target_attr = NULL;
 
-  switch (insn_set) {
+  switch (insn_set_) {
   case kThumb2:
     target_triple = "thumb-none-linux-gnueabi";
     target_attr = "+thumb2,+neon,+neonfp,+vfp3";
@@ -360,7 +353,7 @@
     break;
 
   default:
-    LOG(FATAL) << "Unknown instruction set: " << insn_set;
+    LOG(FATAL) << "Unknown instruction set: " << insn_set_;
   }
 
   std::string errmsg;

src/compiler_llvm/compilation_unit.h

diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h
index 40a4c73..52e4ae6 100644
--- a/src/compiler_llvm/compilation_unit.h
+++ b/src/compiler_llvm/compilation_unit.h
@@ -133,8 +133,7 @@
   size_t mem_usage_;
   uint16_t num_elf_funcs_;
 
-  bool MaterializeToFile(llvm::raw_ostream& out_stream,
-                         InstructionSet insn_set);
+  bool MaterializeToFile(llvm::raw_ostream& out_stream);
 };
 
 } // namespace compiler_llvm