From 0bbb502daa9017480d5fe595556a4f4e5adfcb3f Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Tue, 25 May 2021 10:09:50 -0700 Subject: Revert "[OpaquePtr] Make atomicrmw work with opaque pointers" This reverts commit 0bebda17bea38785c90a6fec3ca01cf74eb78b7c. Causing "Invalid record" errors. --- llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp') 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(Ptr->getType())) return error("Invalid record"); Value *Val = nullptr; - if (popValue(Record, OpNum, NextValueNo, nullptr, Val)) - return error("Invalid record"); - - if (!cast(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(I)->setVolatile(IsVol); InstructionList.push_back(I); -- cgit v1.1