Skip to content

Commit 00d3525

Browse files
[NFC] Remove DIEVisitor constructor and move AbbrevCache population
1 parent 7702cfd commit 00d3525

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

llvm/lib/MCCAS/MCCASObjectV1.cpp

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3119,27 +3119,6 @@ struct DIEVisitor {
31193119
SmallVector<AbbrevContent> AbbrevContents;
31203120
};
31213121

3122-
DIEVisitor() = delete;
3123-
3124-
DIEVisitor(ArrayRef<StringRef> AbbrevEntries,
3125-
BinaryStreamReader DistinctReader, StringRef DistinctData,
3126-
std::function<void(StringRef)> HeaderCallback,
3127-
std::function<void(dwarf::Tag, uint64_t)> StartTagCallback,
3128-
std::function<void(dwarf::Attribute, dwarf::Form, StringRef, bool)>
3129-
AttrCallback,
3130-
std::function<void(bool)> EndTagCallback,
3131-
std::function<void(StringRef)> NewBlockCallback)
3132-
: AbbrevEntries(AbbrevEntries), DistinctReader(DistinctReader),
3133-
DistinctData(DistinctData), HeaderCallback(HeaderCallback),
3134-
StartTagCallback(StartTagCallback), AttrCallback(AttrCallback),
3135-
EndTagCallback(EndTagCallback), NewBlockCallback(NewBlockCallback) {
3136-
AbbrevEntryCache.reserve(AbbrevEntries.size());
3137-
for (unsigned I = 0; I < AbbrevEntries.size(); I++) {
3138-
if (Error E = materializeAbbrevDIE(encodeAbbrevIndex(I)))
3139-
report_fatal_error(std::move(E));
3140-
}
3141-
}
3142-
31433122
Error visitDIERef(DIEDedupeTopLevelRef Ref);
31443123
Error visitDIERef(ArrayRef<DIEDataRef> &DIEChildrenStack);
31453124
Error visitDIEAttrs(BinaryStreamReader &DataReader, StringRef DIEData,
@@ -3324,6 +3303,10 @@ static void popStack(BinaryStreamReader &Reader, StringRef &Data,
33243303
// Visit DIERef CAS objects and materialize them.
33253304
Error DIEVisitor::visitDIERef(ArrayRef<DIEDataRef> &DIEChildrenStack) {
33263305

3306+
for (unsigned I = 0; I < AbbrevEntries.size(); I++)
3307+
if (Error E = materializeAbbrevDIE(encodeAbbrevIndex(I)))
3308+
return E;
3309+
33273310
std::stack<std::pair<StringRef, unsigned>> StackOfNodes;
33283311
auto Data = DIEChildrenStack.empty() ? StringRef()
33293312
: DIEChildrenStack.front().getData();
@@ -3451,8 +3434,14 @@ Error mccasformats::v1::visitDebugInfo(
34513434
HeaderCallback(toStringRef(HeaderData));
34523435

34533436
append_range(TotAbbrevEntries, LoadedTopRef->AbbrevEntries);
3454-
DIEVisitor Visitor{TotAbbrevEntries, DistinctReader, UncompressedDistinctData,
3455-
HeaderCallback, StartTagCallback, AttrCallback,
3456-
EndTagCallback, NewBlockCallback};
3437+
DIEVisitor Visitor{{},
3438+
TotAbbrevEntries,
3439+
DistinctReader,
3440+
UncompressedDistinctData,
3441+
HeaderCallback,
3442+
StartTagCallback,
3443+
AttrCallback,
3444+
EndTagCallback,
3445+
NewBlockCallback};
34573446
return Visitor.visitDIERef(LoadedTopRef->RootDIE);
34583447
}

0 commit comments

Comments
 (0)