From 64513808cadb809e324084687d94aa763b36c925 Mon Sep 17 00:00:00 2001
From: Rafael Ávila de Espíndola <respindola@mozilla.com>
Date: Wed, 22 Jun 2011 16:47:13 -0400
Subject: Use fast regalloc and codegen at OptLevel=0.

---
 src/rustllvm/RustWrapper.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/rustllvm/RustWrapper.cpp')

diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index eb06398c48e..110eb9a3bff 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -53,11 +53,6 @@ extern "C" void LLVMAddStandardModulePasses(LLVMPassManagerRef PM,
 int *RustHackToFetchPassesO = (int*)LLVMAddBasicAliasAnalysisPass;
 int *RustHackToFetchPasses2O = (int*)LLVMAddStandardModulePasses;
 
-enum LLVMCodeGenFileType {
-  LLVMAssemblyFile,
-  LLVMObjectFile,
-  LLVMNullFile         // Do not emit any output.
-};
 
 extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) {
   static std::string err;
@@ -77,7 +72,8 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
                                         LLVMModuleRef M,
                                         const char *triple,
                                         const char *path,
-                                        LLVMCodeGenFileType FileType) {
+                                        TargetMachine::CodeGenFileType FileType,
+                                        CodeGenOpt::Level OptLevel) {
 
   // Set compilation options.
   llvm::NoFramePointerElim = true;
@@ -91,16 +87,14 @@ extern "C" void LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   std::string FeaturesStr;
   TargetMachine *Target = TheTarget->createTargetMachine(triple, FeaturesStr);
   bool NoVerify = false;
-  CodeGenOpt::Level OLvl = CodeGenOpt::Default;
   PassManager *PM = unwrap<PassManager>(PMR);
   std::string ErrorInfo;
   raw_fd_ostream OS(path, ErrorInfo,
                     raw_fd_ostream::F_Binary);
   formatted_raw_ostream FOS(OS);
-  TargetMachine::CodeGenFileType FileType2 =
-    static_cast<TargetMachine::CodeGenFileType>(FileType);
 
-  bool foo = Target->addPassesToEmitFile(*PM, FOS, FileType2, OLvl, NoVerify);
+  bool foo = Target->addPassesToEmitFile(*PM, FOS, FileType, OptLevel,
+                                         NoVerify);
   assert(!foo);
   (void)foo;
   PM->run(*unwrap(M));
-- 
cgit 1.4.1-3-g733a5