<div dir="ltr">Hi David,<br>CHECK-LABEL cut and paste bug?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Apr 3, 2015 at 2:18 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Fri Apr  3 15:18:40 2015<br>
New Revision: 234046<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=234046&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=234046&view=rev</a><br>
Log:<br>
[InstCombine] Use DataLayout to determine vector element width<br>
<br>
InstCombine didn't realize that it needs to use DataLayout to determine<br>
how wide pointers are.  This lead to assertion failures.<br>
<br>
This fixes PR23113.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp<br>
    llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp?rev=234046&r1=234045&r2=234046&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp?rev=234046&r1=234045&r2=234046&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineVectorOps.cpp Fri Apr  3 15:18:40 2015<br>
@@ -987,8 +987,7 @@ Instruction *InstCombiner::visitShuffleV<br>
     unsigned BegIdx = Mask.front();<br>
     VectorType *SrcTy = cast<VectorType>(V->getType());<br>
     unsigned VecBitWidth = SrcTy->getBitWidth();<br>
-    unsigned SrcElemBitWidth =<br>
-        SrcTy->getElementType()->getPrimitiveSizeInBits();<br>
+    unsigned SrcElemBitWidth = DL.getTypeSizeInBits(SrcTy->getElementType());<br>
     assert(SrcElemBitWidth && "vector elements must have a bitwidth");<br>
     unsigned SrcNumElems = SrcTy->getNumElements();<br>
     SmallVector<BitCastInst *, 8> BCs;<br>
@@ -1000,7 +999,7 @@ Instruction *InstCombiner::visitShuffleV<br>
           BCs.push_back(BC);<br>
     for (BitCastInst *BC : BCs) {<br>
       Type *TgtTy = BC->getDestTy();<br>
-      unsigned TgtElemBitWidth = TgtTy->getPrimitiveSizeInBits();<br>
+      unsigned TgtElemBitWidth = DL.getTypeSizeInBits(TgtTy);<br>
       if (!TgtElemBitWidth)<br>
         continue;<br>
       unsigned TgtNumElems = VecBitWidth / TgtElemBitWidth;<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll?rev=234046&r1=234045&r2=234046&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll?rev=234046&r1=234045&r2=234046&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/vec_shuffle.ll Fri Apr  3 15:18:40 2015<br>
@@ -414,3 +414,11 @@ define <4 x i32> @pr20114(<4 x i32> %__m<br>
   %masked_new.i.i.i = and <4 x i32> bitcast (<2 x i64> <i64 ptrtoint (<4 x i32> (<4 x i32>)* @pr20114 to i64), i64 ptrtoint (<4 x i32> (<4 x i32>)* @pr20114 to i64)> to <4 x i32>), %mask01.i<br>
   ret <4 x i32> %masked_new.i.i.i<br>
 }<br>
+<br>
+define <2 x i32*> @pr23113(<4 x i32*> %A) {<br>
+; CHECK-LABEL: @pr20114<br>
+; CHECK: %[[V:.*]] = shufflevector <4 x i32*> %A, <4 x i32*> undef, <2 x i32> <i32 0, i32 1><br>
+; CHECK-NEXT: ret <2 x i32*> %[[V]]<br>
+  %1 = shufflevector <4 x i32*> %A, <4 x i32*> undef, <2 x i32> <i32 0, i32 1><br>
+  ret <2 x i32*> %1<br>
+}<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>