diff options
| author | Arthur Eubanks <aeubanks@google.com> | 2021-05-25 10:09:50 -0700 |
|---|---|---|
| committer | Arthur Eubanks <aeubanks@google.com> | 2021-05-25 10:14:58 -0700 |
| commit | 0bbb502daa9017480d5fe595556a4f4e5adfcb3f (patch) | |
| tree | b2cf6c1e0ba5870f4517b953285277002f03bf33 /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | aabca2d1da11aa3b832ce499acccca093236aac3 (diff) | |
| download | llvm-0bbb502daa9017480d5fe595556a4f4e5adfcb3f.zip llvm-0bbb502daa9017480d5fe595556a4f4e5adfcb3f.tar.gz llvm-0bbb502daa9017480d5fe595556a4f4e5adfcb3f.tar.bz2 | |
Revert "[OpaquePtr] Make atomicrmw work with opaque pointers"
This reverts commit 0bebda17bea38785c90a6fec3ca01cf74eb78b7c.
Causing "Invalid record" errors.
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 6eac552..9d4be53 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -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); |