aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Bitcode
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/Bitcode')
-rw-r--r--llvm/lib/Bitcode/Reader/BitcodeReader.cpp65
-rw-r--r--llvm/lib/Bitcode/Writer/BitcodeWriter.cpp7
2 files changed, 44 insertions, 28 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 8261084..fa7038a 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -520,25 +520,31 @@ public:
struct ExtraInfo {
uint8_t Opcode;
uint8_t Flags;
- unsigned Extra;
- Type *SrcElemTy;
+ unsigned BlockAddressBB = 0;
+ Type *SrcElemTy = nullptr;
+ std::optional<ConstantRange> InRange;
- ExtraInfo(uint8_t Opcode, uint8_t Flags = 0, unsigned Extra = 0,
- Type *SrcElemTy = nullptr)
- : Opcode(Opcode), Flags(Flags), Extra(Extra), SrcElemTy(SrcElemTy) {}
+ ExtraInfo(uint8_t Opcode, uint8_t Flags = 0, Type *SrcElemTy = nullptr,
+ std::optional<ConstantRange> InRange = std::nullopt)
+ : Opcode(Opcode), Flags(Flags), SrcElemTy(SrcElemTy),
+ InRange(std::move(InRange)) {}
+
+ ExtraInfo(uint8_t Opcode, uint8_t Flags, unsigned BlockAddressBB)
+ : Opcode(Opcode), Flags(Flags), BlockAddressBB(BlockAddressBB) {}
};
uint8_t Opcode;
uint8_t Flags;
unsigned NumOperands;
- unsigned Extra; // GEP inrange index or blockaddress BB id.
+ unsigned BlockAddressBB;
Type *SrcElemTy; // GEP source element type.
+ std::optional<ConstantRange> InRange; // GEP inrange attribute.
private:
BitcodeConstant(Type *Ty, const ExtraInfo &Info, ArrayRef<unsigned> OpIDs)
: Value(Ty, SubclassID), Opcode(Info.Opcode), Flags(Info.Flags),
- NumOperands(OpIDs.size()), Extra(Info.Extra),
- SrcElemTy(Info.SrcElemTy) {
+ NumOperands(OpIDs.size()), BlockAddressBB(Info.BlockAddressBB),
+ SrcElemTy(Info.SrcElemTy), InRange(Info.InRange) {
std::uninitialized_copy(OpIDs.begin(), OpIDs.end(),
getTrailingObjects<unsigned>());
}
@@ -560,11 +566,9 @@ public:
return ArrayRef(getTrailingObjects<unsigned>(), NumOperands);
}
- std::optional<unsigned> getInRangeIndex() const {
+ std::optional<ConstantRange> getInRange() const {
assert(Opcode == Instruction::GetElementPtr);
- if (Extra == (unsigned)-1)
- return std::nullopt;
- return Extra;
+ return InRange;
}
const char *getOpcodeName() const {
@@ -1559,7 +1563,7 @@ Expected<Value *> BitcodeReader::materializeValue(unsigned StartValID,
// If the function is already parsed we can insert the block address
// right away.
BasicBlock *BB;
- unsigned BBID = BC->Extra;
+ unsigned BBID = BC->BlockAddressBB;
if (!BBID)
// Invalid reference to entry block.
return error("Invalid ID");
@@ -1602,7 +1606,7 @@ Expected<Value *> BitcodeReader::materializeValue(unsigned StartValID,
case Instruction::GetElementPtr:
C = ConstantExpr::getGetElementPtr(BC->SrcElemTy, ConstOps[0],
ArrayRef(ConstOps).drop_front(),
- BC->Flags, BC->getInRangeIndex());
+ BC->Flags, BC->getInRange());
break;
case Instruction::ExtractElement:
C = ConstantExpr::getExtractElement(ConstOps[0], ConstOps[1]);
@@ -3308,22 +3312,34 @@ Error BitcodeReader::parseConstants() {
}
case bitc::CST_CODE_CE_INBOUNDS_GEP: // [ty, n x operands]
case bitc::CST_CODE_CE_GEP: // [ty, n x operands]
- case bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX: { // [ty, flags, n x
- // operands]
+ case bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX_OLD: // [ty, flags, n x
+ // operands]
+ case bitc::CST_CODE_CE_GEP_WITH_INRANGE: { // [ty, flags, start, end, n x
+ // operands]
if (Record.size() < 2)
return error("Constant GEP record must have at least two elements");
unsigned OpNum = 0;
Type *PointeeType = nullptr;
- if (BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX ||
- Record.size() % 2)
+ if (BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX_OLD ||
+ BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE || Record.size() % 2)
PointeeType = getTypeByID(Record[OpNum++]);
bool InBounds = false;
- std::optional<unsigned> InRangeIndex;
- if (BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX) {
+ std::optional<ConstantRange> InRange;
+ if (BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX_OLD) {
+ uint64_t Op = Record[OpNum++];
+ InBounds = Op & 1;
+ unsigned InRangeIndex = Op >> 1;
+ // "Upgrade" inrange by dropping it. The feature is too niche to
+ // bother.
+ (void)InRangeIndex;
+ } else if (BitCode == bitc::CST_CODE_CE_GEP_WITH_INRANGE) {
uint64_t Op = Record[OpNum++];
InBounds = Op & 1;
- InRangeIndex = Op >> 1;
+ Expected<ConstantRange> MaybeInRange = readConstantRange(Record, OpNum);
+ if (!MaybeInRange)
+ return MaybeInRange.takeError();
+ InRange = MaybeInRange.get();
} else if (BitCode == bitc::CST_CODE_CE_INBOUNDS_GEP)
InBounds = true;
@@ -3356,10 +3372,9 @@ Error BitcodeReader::parseConstants() {
return error("Missing element type for old-style constant GEP");
}
- V = BitcodeConstant::create(Alloc, CurTy,
- {Instruction::GetElementPtr, InBounds,
- InRangeIndex.value_or(-1), PointeeType},
- Elts);
+ V = BitcodeConstant::create(
+ Alloc, CurTy,
+ {Instruction::GetElementPtr, InBounds, PointeeType, InRange}, Elts);
break;
}
case bitc::CST_CODE_CE_SELECT: { // CE_SELECT: [opval#, opval#, opval#]
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index fd211f7..a1ee029 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -2751,9 +2751,10 @@ void ModuleBitcodeWriter::writeConstants(unsigned FirstVal, unsigned LastVal,
Code = bitc::CST_CODE_CE_GEP;
const auto *GO = cast<GEPOperator>(C);
Record.push_back(VE.getTypeID(GO->getSourceElementType()));
- if (std::optional<unsigned> Idx = GO->getInRangeIndex()) {
- Code = bitc::CST_CODE_CE_GEP_WITH_INRANGE_INDEX;
- Record.push_back((*Idx << 1) | GO->isInBounds());
+ if (std::optional<ConstantRange> Range = GO->getInRange()) {
+ Code = bitc::CST_CODE_CE_GEP_WITH_INRANGE;
+ Record.push_back(GO->isInBounds());
+ emitConstantRange(Record, *Range);
} else if (GO->isInBounds())
Code = bitc::CST_CODE_CE_INBOUNDS_GEP;
for (unsigned i = 0, e = CE->getNumOperands(); i != e; ++i) {
generated by cgit v1.1 at 2025-10-01 08:22:01 +0000