[PATCH] D123434: [lld-macho][nfc] Simplify unwind section lookup
Jez Ng via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 22 12:37:11 PDT 2022
This revision was automatically updated to reflect the committed changes.
int3 marked an inline comment as done.
Closed by commit rGe6382d23fcc8: [lld-macho][nfc] Simplify unwind section lookup (authored by int3).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D123434/new/
https://reviews.llvm.org/D123434
Files:
lld/MachO/InputFiles.cpp
lld/MachO/InputFiles.h
Index: lld/MachO/InputFiles.h
===================================================================
--- lld/MachO/InputFiles.h
+++ lld/MachO/InputFiles.h
@@ -151,8 +151,6 @@
std::vector<CallGraphEntry> callGraph;
private:
- Section *compactUnwindSection = nullptr;
-
template <class LP> void parseLazy();
template <class SectionHeader> void parseSections(ArrayRef<SectionHeader>);
template <class LP>
@@ -165,7 +163,7 @@
void parseRelocations(ArrayRef<SectionHeader> sectionHeaders,
const SectionHeader &, Section &);
void parseDebugInfo();
- void registerCompactUnwind();
+ void registerCompactUnwind(Section &compactUnwindSection);
};
// command-line -sectcreate file
Index: lld/MachO/InputFiles.cpp
===================================================================
--- lld/MachO/InputFiles.cpp
+++ lld/MachO/InputFiles.cpp
@@ -344,8 +344,6 @@
section.subsections.push_back({0, isec});
} else if (auto recordSize = getRecordSize(segname, name)) {
splitRecords(*recordSize);
- if (name == section_names::compactUnwind)
- compactUnwindSection = §ion;
} else if (segname == segment_names::llvm) {
if (config->callGraphProfileSort && name == section_names::cgProfile)
checkError(parseCallGraph(data, callGraph));
@@ -917,8 +915,19 @@
parseRelocations(sectionHeaders, sectionHeaders[i], *sections[i]);
parseDebugInfo();
+
+ Section *ehFrameSection = nullptr;
+ Section *compactUnwindSection = nullptr;
+ for (Section *sec : sections) {
+ Section **s = StringSwitch<Section **>(sec->name)
+ .Case(section_names::compactUnwind, &compactUnwindSection)
+ .Case(section_names::ehFrame, &ehFrameSection)
+ .Default(nullptr);
+ if (s)
+ *s = sec;
+ }
if (compactUnwindSection)
- registerCompactUnwind();
+ registerCompactUnwind(*compactUnwindSection);
}
template <class LP> void ObjFile::parseLazy() {
@@ -981,8 +990,8 @@
}
// Create pointers from symbols to their associated compact unwind entries.
-void ObjFile::registerCompactUnwind() {
- for (const Subsection &subsection : compactUnwindSection->subsections) {
+void ObjFile::registerCompactUnwind(Section &compactUnwindSection) {
+ for (const Subsection &subsection : compactUnwindSection.subsections) {
ConcatInputSection *isec = cast<ConcatInputSection>(subsection.isec);
// Hack!! Since each CUE contains a different function address, if ICF
// operated naively and compared the entire contents of each CUE, entries
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D123434.424579.patch
Type: text/x-patch
Size: 2598 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220422/6bd783dd/attachment.bin>
More information about the llvm-commits
mailing list