From: Pawel Bylica <chfast@gmail.com>
Date: Mon, 22 Jun 2015 21:54:07 +0000 (+0000)
Subject: Revert r240291: causes problems in self-hosted builds.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e903f64b10dc61461b135425460efb63346f0fed;p=oota-llvm.git

Revert r240291: causes problems in self-hosted builds.


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

diff --git a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 80a1b5b3be7..bc2e5f13d43 100644
--- a/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -4275,7 +4275,7 @@ SDValue DAGCombiner::visitSHL(SDNode *N) {
   if (isNullConstant(N0))
     return N0;
   // fold (shl x, c >= size(x)) -> undef
-  if (N1C && N1C->getAPIntValue().uge(OpSizeInBits))
+  if (N1C && N1C->getZExtValue() >= OpSizeInBits)
     return DAG.getUNDEF(VT);
   // fold (shl x, 0) -> x
   if (N1C && N1C->isNullValue())
diff --git a/test/CodeGen/X86/fold-vector-shl-crash.ll b/test/CodeGen/X86/fold-vector-shl-crash.ll
deleted file mode 100644
index 9f81e44074f..00000000000
--- a/test/CodeGen/X86/fold-vector-shl-crash.ll
+++ /dev/null
@@ -1,9 +0,0 @@
-; RUN: llc < %s -march=x86-64 | FileCheck %s
-; RUN: llc < %s -march=x86    | FileCheck %s
-
-;CHECK-LABEL: test
-define <2 x i256> @test() {
-  %S = shufflevector <2 x i256> zeroinitializer, <2 x i256> <i256 -1, i256 -1>, <2 x i32> <i32 0, i32 2>
-  %B = shl <2 x i256> %S, <i256 -1, i256 -1> ; DAG Combiner crashes here
-  ret <2 x i256> %B
-}