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

Revert "[OpaquePtr] Make atomicrmw work with opaque pointers"

Browse Source 
This reverts commit 0bebda17be.

Causing "Invalid record" errors.
This commit is contained in:
Arthur Eubanks
2021-05-25 10:09:50 -07:00
parent aabca2d1da
commit 0bbb502daa
5 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5238,18 +5238,15 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
unsigned OpNum = 0;
Value *Ptr = nullptr;
if (getValueTypePair(Record, OpNum, NextValueNo, Ptr))
if (getValueTypePair(Record, OpNum, NextValueNo, Ptr, &FullTy))
return error("Invalid record");
if (!isa<PointerType>(Ptr->getType()))
return error("Invalid record");
Value *Val = nullptr;
if (popValue(Record, OpNum, NextValueNo, nullptr, Val))
return error("Invalid record");
if (!cast<PointerType>(Ptr->getType())
->isOpaqueOrPointeeTypeMatches(Val->getType()))
if (popValue(Record, OpNum, NextValueNo,
getPointerElementFlatType(FullTy), Val))
return error("Invalid record");
if (!(NumRecords == (OpNum + 4) || NumRecords == (OpNum + 5)))
@@ -5282,6 +5279,7 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
Align(TheModule->getDataLayout().getTypeStoreSize(Val->getType()));
I = new AtomicRMWInst(Operation, Ptr, Val, *Alignment, Ordering, SSID);
FullTy = getPointerElementFlatType(FullTy);
cast<AtomicRMWInst>(I)->setVolatile(IsVol);
InstructionList.push_back(I);