maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[BitcodeReader] Fix DelayedShuffle handling for ConstantExpr shuffles. 

The indexing was messed up, so the result was completely broken.

Shuffle constant exprs are rare in practice; without vscale types,
constant folding generally elminates them. So sort of hard to trip over.

Fixes regression from D72467.

Differential Revision: https://reviews.llvm.org/D80330
This commit is contained in:
Eli Friedman 2020-05-20 15:08:36 -07:00
parent f4c337ab85
commit b5740105d2
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -2337,6 +2337,7 @@ Error BitcodeReader::parseConstants() {
uint64_t Op0Idx;
uint64_t Op1Idx;
uint64_t Op2Idx;
unsigned CstNo;
};
std::vector<DelayedShufTy> DelayedShuffles;
while (true) {
@ -2350,9 +2351,6 @@ Error BitcodeReader::parseConstants() {
case BitstreamEntry::Error:
return error("Malformed block");
case BitstreamEntry::EndBlock:
if (NextCstNo != ValueList.size())
return error("Invalid constant reference");
// Once all the constants have been read, go through and resolve forward
// references.
//
@ -2365,6 +2363,7 @@ Error BitcodeReader::parseConstants() {
uint64_t Op0Idx = DelayedShuffle.Op0Idx;
uint64_t Op1Idx = DelayedShuffle.Op1Idx;
uint64_t Op2Idx = DelayedShuffle.Op2Idx;
uint64_t CstNo = DelayedShuffle.CstNo;
Constant *Op0 = ValueList.getConstantFwdRef(Op0Idx, OpTy);
Constant *Op1 = ValueList.getConstantFwdRef(Op1Idx, OpTy);
Type *ShufTy =
@ -2375,9 +2374,12 @@ Error BitcodeReader::parseConstants() {
SmallVector<int, 16> Mask;
ShuffleVectorInst::getShuffleMask(Op2, Mask);
Value *V = ConstantExpr::getShuffleVector(Op0, Op1, Mask);
ValueList.assignValue(V, NextCstNo, DelayedShuffle.CurFullTy);
++NextCstNo;
ValueList.assignValue(V, CstNo, DelayedShuffle.CurFullTy);
}
if (NextCstNo != ValueList.size())
return error("Invalid constant reference");
ValueList.resolveConstantForwardRefs();
return Error::success();
case BitstreamEntry::Record:
@ -2733,7 +2735,8 @@ Error BitcodeReader::parseConstants() {
if (Record.size() < 3 || !OpTy)
return error("Invalid record");
DelayedShuffles.push_back(
{OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2]});
{OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2], NextCstNo});
++NextCstNo;
continue;
}
case bitc::CST_CODE_CE_SHUFVEC_EX: { // [opty, opval, opval, opval]
@ -2743,7 +2746,8 @@ Error BitcodeReader::parseConstants() {
if (Record.size() < 4 || !RTy || !OpTy)
return error("Invalid record");
DelayedShuffles.push_back(
{OpTy, RTy, CurFullTy, Record[1], Record[2], Record[3]});
{OpTy, RTy, CurFullTy, Record[1], Record[2], Record[3], NextCstNo});
++NextCstNo;
continue;
}
case bitc::CST_CODE_CE_CMP: { // CE_CMP: [opty, opval, opval, pred]

10
llvm/test/Bitcode/vscale-shuffle.ll Normal file
View File

@ -0,0 +1,10 @@
; RUN: llvm-as < %s | llvm-dis -disable-output
; RUN: verify-uselistorder < %s
define void @f() {
%l = call <vscale x 16 x i8> @l(<vscale x 16 x i1> shufflevector (<vscale x 16 x i1> insertelement (<vscale x 16 x i1> undef, i1 true, i32 0), <vscale x 16 x i1> undef, <vscale x 16 x i32> zeroinitializer))
%i = add <vscale x 2 x i64> undef, shufflevector (<vscale x 2 x i64> insertelement (<vscale x 2 x i64> undef, i64 1, i32 0), <vscale x 2 x i64> undef, <vscale x 2 x i32> zeroinitializer)
unreachable
}
declare <vscale x 16 x i8> @l(<vscale x 16 x i1>)