Poorly named option.

llvm-svn: 47400

2 files changed, 4 insertions, 3 deletions

diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
index fa082727e92..b61e68e0cf9 100644
--- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -46,8 +46,9 @@ STATISTIC(NumLoadMoved, "Number of loads moved below TokenFactor");
 
 namespace {
   static cl::opt<bool>
-  FoldAndInTest("x86-fold-and-in-test", cl::desc("Fold and operation in test"),
-                cl::init(false), cl::Hidden);
+  AlwaysFoldAndInTest("always-fold-and-in-test",
+                cl::desc("Always fold and operation in test"),
+                cl::init(true), cl::Hidden);
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/X86/X86InstrInfo.td b/llvm/lib/Target/X86/X86InstrInfo.td
index 276468c8fd2..0071c00262e 100644
--- a/llvm/lib/Target/X86/X86InstrInfo.td
+++ b/llvm/lib/Target/X86/X86InstrInfo.td
@@ -248,7 +248,7 @@ def extloadi32i16  : PatFrag<(ops node:$ptr), (i32 (extloadi16 node:$ptr))>;
 
 // An 'and' node with a single use.
 def and_su : PatFrag<(ops node:$lhs, node:$rhs), (and node:$lhs, node:$rhs), [{
-  return !FoldAndInTest || N->hasOneUse();
+  return AlwaysFoldAndInTest || N->hasOneUse();
 }]>;
 
 //===----------------------------------------------------------------------===//