[PATCH] D12440: [BitcodeReader] Ensure we can read constant vector selects with an i1 condition
Filipe Cabecinhas via llvm-commits
llvm-commits at lists.llvm.org
Mon Aug 31 11:01:38 PDT 2015
This revision was automatically updated to reflect the committed changes.
Closed by commit rL246459: [BitcodeReader] Ensure we can read constant vector selects with an i1 condition (authored by filcab).
Changed prior to commit:
http://reviews.llvm.org/D12440?vs=33476&id=33600#toc
Repository:
rL LLVM
http://reviews.llvm.org/D12440
Files:
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
llvm/trunk/test/Bitcode/select.ll
Index: llvm/trunk/test/Bitcode/select.ll
===================================================================
--- llvm/trunk/test/Bitcode/select.ll
+++ llvm/trunk/test/Bitcode/select.ll
@@ -8,3 +8,11 @@
; CHECK: define <2 x i32> @main() {
; CHECK: ret <2 x i32> <i32 0, i32 undef>
; CHECK: }
+
+define <2 x float> @f() {
+ ret <2 x float> select (i1 ptrtoint (<2 x float> ()* @f to i1), <2 x float> <float 1.000000e+00, float 0.000000e+00>, <2 x float> zeroinitializer)
+}
+
+; CHECK: define <2 x float> @f() {
+; CHECK: ret <2 x float> select (i1 ptrtoint (<2 x float> ()* @f to i1), <2 x float> <float 1.000000e+00, float 0.000000e+00>, <2 x float> zeroinitializer)
+; CHECK: }
Index: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
===================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -2475,11 +2475,12 @@
Type *SelectorTy = Type::getInt1Ty(Context);
- // If CurTy is a vector of length n, then Record[0] must be a <n x i1>
- // vector. Otherwise, it must be a single bit.
+ // The selector might be an i1 or an <n x i1>
+ // Get the type from the ValueList before getting a forward ref.
if (VectorType *VTy = dyn_cast<VectorType>(CurTy))
- SelectorTy = VectorType::get(Type::getInt1Ty(Context),
- VTy->getNumElements());
+ if (Value *V = ValueList[Record[0]])
+ if (SelectorTy != V->getType())
+ SelectorTy = VectorType::get(SelectorTy, VTy->getNumElements());
V = ConstantExpr::getSelect(ValueList.getConstantFwdRef(Record[0],
SelectorTy),
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12440.33600.patch
Type: text/x-patch
Size: 1754 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150831/145f5dae/attachment.bin>
More information about the llvm-commits
mailing list