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

Revert "[BitcodeReader] Fix DelayedShuffle handling for ConstantExpr shuffles." 

Patch has a memory leak bug that broke the ASan buildbots. More info
available at: https://reviews.llvm.org/D80330

This reverts commit b5740105d2.
This commit is contained in:
Mitch Phillips 2020-06-24 13:55:28 -07:00
parent b7d41a11cd
commit 10045cbe01
2 changed files with 7 additions and 21 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,7 +2337,6 @@ Error BitcodeReader::parseConstants() {
uint64_t Op0Idx;
uint64_t Op1Idx;
uint64_t Op2Idx;
unsigned CstNo;
};
std::vector<DelayedShufTy> DelayedShuffles;
while (true) {
@ -2351,6 +2350,9 @@ 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.
//
@ -2363,7 +2365,6 @@ 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 =
@ -2374,12 +2375,9 @@ Error BitcodeReader::parseConstants() {
SmallVector<int, 16> Mask;
ShuffleVectorInst::getShuffleMask(Op2, Mask);
Value *V = ConstantExpr::getShuffleVector(Op0, Op1, Mask);
ValueList.assignValue(V, CstNo, DelayedShuffle.CurFullTy);
ValueList.assignValue(V, NextCstNo, DelayedShuffle.CurFullTy);
++NextCstNo;
}
if (NextCstNo != ValueList.size())
return error("Invalid constant reference");
ValueList.resolveConstantForwardRefs();
return Error::success();
case BitstreamEntry::Record:
@ -2735,8 +2733,7 @@ Error BitcodeReader::parseConstants() {
if (Record.size() < 3 || !OpTy)
return error("Invalid record");
DelayedShuffles.push_back(
{OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2], NextCstNo});
++NextCstNo;
{OpTy, OpTy, CurFullTy, Record[0], Record[1], Record[2]});
continue;
}
case bitc::CST_CODE_CE_SHUFVEC_EX: { // [opty, opval, opval, opval]
@ -2746,8 +2743,7 @@ 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], NextCstNo});
++NextCstNo;
{OpTy, RTy, CurFullTy, Record[1], Record[2], Record[3]});
continue;
}
case bitc::CST_CODE_CE_CMP: { // CE_CMP: [opty, opval, opval, pred]

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

@ -1,10 +0,0 @@
; 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>)