Skip to content

Commit 058e527

Browse files
[AccelTable][NFC] Fix typos and duplicated code (#76155)
Renaming a member variable from "Endoding" to "Encoding". Also replace inlined code for "isNormalized" with a call to the function, so that if the definition of normalization ever changes, we only need to change the one place.
1 parent 7433b1c commit 058e527

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

llvm/include/llvm/CodeGen/AccelTable.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,14 @@ class DWARF5AccelTableData : public AccelTableData {
270270
#endif
271271

272272
uint64_t getDieOffset() const {
273-
assert(std::holds_alternative<uint64_t>(OffsetVal) &&
274-
"Accessing DIE Offset before normalizing.");
273+
assert(isNormalized() && "Accessing DIE Offset before normalizing.");
275274
return std::get<uint64_t>(OffsetVal);
276275
}
277276
unsigned getDieTag() const { return DieTag; }
278277
unsigned getUnitID() const { return UnitID; }
279278
bool isTU() const { return IsTU; }
280279
void normalizeDIEToOffset() {
281-
assert(std::holds_alternative<const DIE *>(OffsetVal) &&
282-
"Accessing offset after normalizing.");
280+
assert(!isNormalized() && "Accessing offset after normalizing.");
283281
OffsetVal = std::get<const DIE *>(OffsetVal)->getOffset();
284282
}
285283
bool isNormalized() const {
@@ -309,7 +307,7 @@ class DWARF5AccelTable : public AccelTable<DWARF5AccelTableData> {
309307
public:
310308
struct UnitIndexAndEncoding {
311309
unsigned Index;
312-
DWARF5AccelTableData::AttributeEncoding Endoding;
310+
DWARF5AccelTableData::AttributeEncoding Encoding;
313311
};
314312
/// Returns type units that were constructed.
315313
const TUVectorTy &getTypeUnitsSymbols() { return TUSymbolsOrHashes; }

llvm/lib/CodeGen/AsmPrinter/AccelTable.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ static uint32_t constructAbbreviationTag(
412412
const std::optional<DWARF5AccelTable::UnitIndexAndEncoding> &EntryRet) {
413413
uint32_t AbbrvTag = 0;
414414
if (EntryRet)
415-
AbbrvTag |= 1 << EntryRet->Endoding.Index;
415+
AbbrvTag |= 1 << EntryRet->Encoding.Index;
416416
AbbrvTag |= 1 << dwarf::DW_IDX_die_offset;
417417
AbbrvTag |= Tag << LowerBitSize;
418418
return AbbrvTag;
@@ -429,7 +429,7 @@ void Dwarf5AccelTableWriter<DataT>::populateAbbrevsMap() {
429429
if (Abbreviations.count(AbbrvTag) == 0) {
430430
SmallVector<DWARF5AccelTableData::AttributeEncoding, 2> UA;
431431
if (EntryRet)
432-
UA.push_back(EntryRet->Endoding);
432+
UA.push_back(EntryRet->Encoding);
433433
UA.push_back({dwarf::DW_IDX_die_offset, dwarf::DW_FORM_ref4});
434434
Abbreviations.try_emplace(AbbrvTag, UA);
435435
}

0 commit comments

Comments
 (0)