caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[SVE] Pass Scalable argument to VectorType::get in Bitcode Reader"

Browse Source 
This reverts commit 5df53a2259.

Caused test failures.
This commit is contained in:
Eli Friedman
2020-01-17 12:13:49 -08:00
parent 927f8f40a4
commit 447dcef790
2 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2630,13 +2630,12 @@ Error BitcodeReader::parseConstants() {
Type *SelectorTy = Type::getInt1Ty(Context);
// The selector might be an i1, an <n x i1>, or a <vscale x n x i1>
// 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))
if (Value *V = ValueList[Record[0]])
if (SelectorTy != V->getType())
SelectorTy = VectorType::get(SelectorTy,
VTy->getElementCount());
SelectorTy = VectorType::get(SelectorTy, VTy->getNumElements());
V = ConstantExpr::getSelect(ValueList.getConstantFwdRef(Record[0],
SelectorTy),
@@ -2694,7 +2693,7 @@ Error BitcodeReader::parseConstants() {
Constant *Op0 = ValueList.getConstantFwdRef(Record[0], OpTy);
Constant *Op1 = ValueList.getConstantFwdRef(Record[1], OpTy);
Type *ShufTy = VectorType::get(Type::getInt32Ty(Context),
OpTy->getElementCount());
OpTy->getNumElements());
Constant *Op2 = ValueList.getConstantFwdRef(Record[2], ShufTy);
V = ConstantExpr::getShuffleVector(Op0, Op1, Op2);
break;
@@ -2708,7 +2707,7 @@ Error BitcodeReader::parseConstants() {
Constant *Op0 = ValueList.getConstantFwdRef(Record[1], OpTy);
Constant *Op1 = ValueList.getConstantFwdRef(Record[2], OpTy);
Type *ShufTy = VectorType::get(Type::getInt32Ty(Context),
RTy->getElementCount());
RTy->getNumElements());
Constant *Op2 = ValueList.getConstantFwdRef(Record[3], ShufTy);
V = ConstantExpr::getShuffleVector(Op0, Op1, Op2);
break;
@@ -4169,15 +4168,9 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
return error("Invalid record");
if (!Vec1->getType()->isVectorTy() || !Vec2->getType()->isVectorTy())
return error("Invalid type for value");
ElementCount EC1 = cast<VectorType>(Vec1->getType())->getElementCount();
if (EC1 != cast<VectorType>(Vec2->getType())->getElementCount())
return error("Mismatch between argument types");
I = new ShuffleVectorInst(Vec1, Vec2, Mask);
FullTy = VectorType::get(FullTy->getVectorElementType(),
EC1);
Mask->getType()->getVectorNumElements());
InstructionList.push_back(I);
break;
}