[llvm] r240343 - Revert r240291: causes problems in self-hosted builds.

[Pawel Bylica]

Author: chfast
Date: Mon Jun 22 16:54:07 2015
New Revision: 240343

URL: http://llvm.org/viewvc/llvm-project?rev=240343&view=rev
Log:
Revert r240291: causes problems in self-hosted builds.

Removed:
    llvm/trunk/test/CodeGen/X86/fold-vector-shl-crash.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=240343&r1=240342&r2=240343&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Mon Jun 22 16:54:07 2015
@@ -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())

Removed: llvm/trunk/test/CodeGen/X86/fold-vector-shl-crash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fold-vector-shl-crash.ll?rev=240342&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fold-vector-shl-crash.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fold-vector-shl-crash.ll (removed)
@@ -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
-}