Revert "Take account of boolean vector contents when promoting a build vector from i1 to some other type. rdar://problem/12210060"

This reverts commit 5dd9e214fb92847e947f9edab170f9b4e52b908f.

Thanks to Duncan for explaining how this should have been done.

Conflicts:

	test/CodeGen/X86/vec_select.ll

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

2 files changed, 1 insertions, 33 deletions

diff --git a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
index cd93a511b6..e8e968aaef 100644
--- a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
+++ b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
@@ -2913,24 +2913,8 @@ SDValue DAGTypeLegalizer::PromoteIntRes_BUILD_VECTOR(SDNode *N) {
 
   SmallVector<SDValue, 8> Ops;
   Ops.reserve(NumElems);
-  unsigned ExtendOp = ISD::ANY_EXTEND;
-  // Extending boolean constants needs to consider the
-  // value boolean vector constants take on this target and extend
-  // with sign or zeros appropriately.
-  if (OutVT.getVectorElementType() == MVT::i1) {
-    switch (TLI.getBooleanContents(true)) {
-      case TargetLowering::UndefinedBooleanContent:
-        break;
-      case TargetLowering::ZeroOrOneBooleanContent:
-      ExtendOp = ISD::ZERO_EXTEND;
-        break;
-      case TargetLowering::ZeroOrNegativeOneBooleanContent:
-        ExtendOp = ISD::SIGN_EXTEND;
-        break;
-    }
-  }
   for (unsigned i = 0; i != NumElems; ++i) {
-    SDValue Op = DAG.getNode(ExtendOp, dl, NOutVTElem, N->getOperand(i));
+    SDValue Op = DAG.getNode(ISD::ANY_EXTEND, dl, NOutVTElem, N->getOperand(i));
     Ops.push_back(Op);
   }
 
diff --git a/test/CodeGen/X86/vec_select.ll b/test/CodeGen/X86/vec_select.ll
deleted file mode 100644
index a0afe1fecd..0000000000
--- a/test/CodeGen/X86/vec_select.ll
+++ /dev/null
@@ -1,16 +0,0 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 | FileCheck %s
-
-; When legalizing the v4i1 constant, we need to consider the boolean contents
-; For x86 a boolean vector constant is all ones so the constants in memory
-; will be ~0U not 1.
-
-; CHECK: .long	4294967295
-; CHECK: .long	4294967295
-; CHECK: .long	0
-; CHECK: .long	0
-
-; CHECK: test
-define <4 x i8> @test(<4 x i8> %a, <4 x i8> %b) {
-  %sel = select <4 x i1> <i1 true, i1 true, i1 false, i1 false>, <4 x i8> %a, <4 x i8> %b
-	ret <4 x i8> %sel
-}