commit f1837134518d1e6412dccb94570040f09fc35f0b
author Brian Carlstrom <bdc@google.com> Tue Apr 17 10:29:05 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue Apr 17 10:29:05 2012 -0700
tree 6cf9b40883c4e73141e4cb0b9a141ec0ebff90c0
parent 2156cc76d440b83383d5cb7454458711a2066913
parent 15077815ccd9b7139a3199fe995d65b7a04a83c9

Merge remote-tracking branch 'goog/dalvik-dev' into jb-release-to-dalvik-dev

src/compiler_llvm/compilation_unit.cc

diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index 17bd586..975f961 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -203,7 +203,7 @@
   llvm::TargetMachine* target_machine =
     target->createTargetMachine(target_triple, "", target_attr, target_options,
                                 llvm::Reloc::Static, llvm::CodeModel::Small,
-                                llvm::CodeGenOpt::Aggressive);
+                                llvm::CodeGenOpt::None);
 
   CHECK(target_machine != NULL) << "Failed to create target machine";
 
@@ -219,14 +219,6 @@
   llvm::FunctionPassManager fpm(module_);
   fpm.add(new llvm::TargetData(*target_data));
 
-  // Add optimization pass
-  llvm::PassManagerBuilder pm_builder;
-  pm_builder.Inliner = NULL; // TODO: add some inline in the future
-  pm_builder.OptLevel = 3;
-  pm_builder.DisableSimplifyLibCalls = 1;
-  pm_builder.populateModulePassManager(pm);
-  pm_builder.populateFunctionPassManager(fpm);
-
   // Add passes to emit ELF image
   {
     llvm::formatted_raw_ostream formatted_os(
@@ -244,14 +236,6 @@
     // Add pass to update the frame_size_in_bytes_
     pm.add(new ::UpdateFrameSizePass(this));
 
-    // Run the per-function optimization
-    fpm.doInitialization();
-    for (llvm::Module::iterator F = module_->begin(), E = module_->end();
-         F != E; ++F) {
-      fpm.run(*F);
-    }
-    fpm.doFinalization();
-
     // Run the code generation passes
     pm.run(*module_);
   }