Set to default: x86 no longer fold and into test if it has more than one use.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@47711 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp
index 75e9faecb290b3f72e95c2b170acf1e94153e1c1..aa45ab8e9201f0f4b8d4a67799cf836b6e26c424 100644 (file)
--- a/lib/Target/X86/X86ISelDAGToDAG.cpp
+++ b/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -48,7 +48,7 @@ namespace {
   static cl::opt<bool>
   AlwaysFoldAndInTest("always-fold-and-in-test",
                 cl::desc("Always fold and operation in test"),
-                cl::init(true), cl::Hidden);
+                cl::init(false), cl::Hidden);
 }
 
 //===----------------------------------------------------------------------===//

diff --git a/test/CodeGen/X86/test-nofold.ll b/test/CodeGen/X86/test-nofold.ll
index 7ee8eb0b9c2fe6f3ae1d454c39be9d40f17ecc09..a24a9a0940a0eb0f8d662705c07e09fa549693ed 100644 (file)
--- a/test/CodeGen/X86/test-nofold.ll
+++ b/test/CodeGen/X86/test-nofold.ll
@@ -1,6 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah | grep {testl.*%e.x.*%e.x}
 ; rdar://5752025
-; XFAIL: *
 
 ; We don't want to fold the and into the test, because the and clobbers its
 ; input forcing a copy.  We want: