This is an archive of the discontinued LLVM Phabricator instance.

Differential D134299

[BOLT][NFC] Refactor section-mapping code
AbandonedPublic

Authored by maksfb on Sep 20 2022, 11:59 AM.

Details

Reviewers
yota9
Amir
ayermolo
rafauler
Summary

Simplify checks while searching for the original section.

Diff Detail

Event Timeline

maksfb created this revision.Sep 20 2022, 11:59 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 20 2022, 11:59 AM
Herald added a subscriber: treapster. · View Herald Transcript
maksfb requested review of this revision.Sep 20 2022, 11:59 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 20 2022, 11:59 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B187798: Diff 461649.Sep 20 2022, 12:16 PM
maksfb abandoned this revision.Oct 7 2022, 3:07 PM

Part of https://reviews.llvm.org/D135494

Revision Contents

PathSize
bolt/
lib/
Rewrite/
10 lines

Diff 461649

bolt/lib/Rewrite/RewriteInstance.cpp

Show First 20 Lines • Show All 3,812 Lines • ▼ Show 20 Lines for (std::string &SectionName : Sections) {
Section->setOutputAddress(NextAvailableAddress); Section->setOutputAddress(NextAvailableAddress);
Section->setOutputFileOffset(getFileOffsetForAddress(NextAvailableAddress)); Section->setOutputFileOffset(getFileOffsetForAddress(NextAvailableAddress));
NextAvailableAddress += Section->getOutputSize(); NextAvailableAddress += Section->getOutputSize();
} }
// Handling for sections with relocations. // Handling for sections with relocations.
for (BinarySection &Section : BC->sections()) { for (BinarySection &Section : BC->sections()) {
if (!Section.hasSectionRef()) if (!Section.hasSectionRef() || !Section.isAllocatable())
continue; continue;
StringRef SectionName = Section.getName(); StringRef SectionName = Section.getName();
ErrorOr<BinarySection &> OrgSection = ErrorOr<BinarySection &> OrgSection =
BC->getUniqueSectionByName((getOrgSecPrefix() + SectionName).str()); BC->getUniqueSectionByName((getOrgSecPrefix() + SectionName).str());
if (!OrgSection || if (!OrgSection)
!OrgSection->isAllocatable() ||
!OrgSection->isFinalized() ||
!OrgSection->hasValidSectionID())
continue; continue;
assert(OrgSection->isAllocatable() && OrgSection->isFinalized() &&
OrgSection->hasValidSectionID() && "section check failed");
if (OrgSection->getOutputAddress()) { if (OrgSection->getOutputAddress()) {
LLVM_DEBUG(dbgs() << "BOLT-DEBUG: section " << SectionName LLVM_DEBUG(dbgs() << "BOLT-DEBUG: section " << SectionName
<< " is already mapped at 0x" << " is already mapped at 0x"
<< Twine::utohexstr(OrgSection->getOutputAddress()) << Twine::utohexstr(OrgSection->getOutputAddress())
<< '\n'); << '\n');
continue; continue;
} }
LLVM_DEBUG( LLVM_DEBUG(
▲ Show 20 Lines • Show All 1,756 Lines • Show Last 20 Lines