diff options
| -rw-r--r-- | lib/CodeGen/LLVMTargetMachine.cpp | 11 | ||||
| -rw-r--r-- | test/CodeGen/X86/2008-05-21-CoalescerBug.ll | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/lib/CodeGen/LLVMTargetMachine.cpp b/lib/CodeGen/LLVMTargetMachine.cpp index cd444552f7..333b8ab9b7 100644 --- a/lib/CodeGen/LLVMTargetMachine.cpp +++ b/lib/CodeGen/LLVMTargetMachine.cpp @@ -56,12 +56,9 @@ DisablePostRAScheduler("disable-post-RA-scheduler", // Enable or disable FastISel. Both options are needed, because // FastISel is enabled by default with -fast, and we wish to be // able to enable or disable fast-isel independently from -fast. -static cl::opt<bool> +static cl::opt<cl::boolOrDefault> EnableFastISelOption("fast-isel", cl::Hidden, cl::desc("Enable the experimental \"fast\" instruction selector")); -static cl::opt<bool> -DisableFastISelOption("disable-fast-isel", cl::Hidden, - cl::desc("Disable the experimental \"fast\" instruction selector")); FileModel::Model LLVMTargetMachine::addPassesToEmitFile(PassManagerBase &PM, @@ -175,10 +172,8 @@ bool LLVMTargetMachine::addCommonCodeGenPasses(PassManagerBase &PM, bool Fast) { // Standard Lower-Level Passes. // Enable FastISel with -fast, but allow that to be overridden. - assert((!EnableFastISelOption || !DisableFastISelOption) && - "Both -fast-isel and -disable-fast-isel given!"); - if (EnableFastISelOption || - (Fast && !DisableFastISelOption)) + if (EnableFastISelOption == cl::BOU_TRUE || + (Fast && EnableFastISelOption != cl::BOU_FALSE)) EnableFastISel = true; // Ask the target for an isel. diff --git a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll index 666c26157a..bed218fb70 100644 --- a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll +++ b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -fast -disable-fast-isel | grep mov | count 5 +; RUN: llvm-as < %s | llc -march=x86 -fast -fast-isel=false | grep mov | count 5 ; PR2343 %llvm.dbg.anchor.type = type { i32, i32 } |