Skip to content

Commit 12d322d

Browse files
authored
[BOLT][NFC] Use getEHFrameHdrSectionName() (#90257)
Reference section name via wrapper.
1 parent d9fd0dd commit 12d322d

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

bolt/include/bolt/Rewrite/RewriteInstance.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ class RewriteInstance {
424424

425425
/// Common section names.
426426
static StringRef getEHFrameSectionName() { return ".eh_frame"; }
427+
static StringRef getEHFrameHdrSectionName() { return ".eh_frame_hdr"; }
427428
static StringRef getRelaDynSectionName() { return ".rela.dyn"; }
428429

429430
/// FILE symbol name used for local fragments of global functions.

bolt/lib/Rewrite/RewriteInstance.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3978,8 +3978,8 @@ void RewriteInstance::patchELFPHDRTable() {
39783978
NewPhdr.p_filesz = sizeof(NewPhdr) * Phnum;
39793979
NewPhdr.p_memsz = sizeof(NewPhdr) * Phnum;
39803980
} else if (Phdr.p_type == ELF::PT_GNU_EH_FRAME) {
3981-
ErrorOr<BinarySection &> EHFrameHdrSec =
3982-
BC->getUniqueSectionByName(getNewSecPrefix() + ".eh_frame_hdr");
3981+
ErrorOr<BinarySection &> EHFrameHdrSec = BC->getUniqueSectionByName(
3982+
getNewSecPrefix() + getEHFrameHdrSectionName());
39833983
if (EHFrameHdrSec && EHFrameHdrSec->isAllocatable() &&
39843984
EHFrameHdrSec->isFinalized()) {
39853985
NewPhdr.p_offset = EHFrameHdrSec->getOutputFileOffset();
@@ -5692,7 +5692,8 @@ void RewriteInstance::writeEHFrameHeader() {
56925692
BC->AsmInfo->getCodePointerSize()));
56935693
check_error(std::move(Er), "failed to parse EH frame");
56945694

5695-
LLVM_DEBUG(dbgs() << "BOLT: writing a new .eh_frame_hdr\n");
5695+
LLVM_DEBUG(dbgs() << "BOLT: writing a new " << getEHFrameHdrSectionName()
5696+
<< '\n');
56965697

56975698
NextAvailableAddress =
56985699
appendPadding(Out->os(), NextAvailableAddress, EHFrameHdrAlign);
@@ -5710,16 +5711,17 @@ void RewriteInstance::writeEHFrameHeader() {
57105711
const unsigned Flags = BinarySection::getFlags(/*IsReadOnly=*/true,
57115712
/*IsText=*/false,
57125713
/*IsAllocatable=*/true);
5713-
BinarySection *OldEHFrameHdrSection = getSection(".eh_frame_hdr");
5714+
BinarySection *OldEHFrameHdrSection = getSection(getEHFrameHdrSectionName());
57145715
if (OldEHFrameHdrSection)
5715-
OldEHFrameHdrSection->setOutputName(getOrgSecPrefix() + ".eh_frame_hdr");
5716+
OldEHFrameHdrSection->setOutputName(getOrgSecPrefix() +
5717+
getEHFrameHdrSectionName());
57165718

57175719
BinarySection &EHFrameHdrSec = BC->registerOrUpdateSection(
5718-
getNewSecPrefix() + ".eh_frame_hdr", ELF::SHT_PROGBITS, Flags, nullptr,
5719-
NewEHFrameHdr.size(), /*Alignment=*/1);
5720+
getNewSecPrefix() + getEHFrameHdrSectionName(), ELF::SHT_PROGBITS, Flags,
5721+
nullptr, NewEHFrameHdr.size(), /*Alignment=*/1);
57205722
EHFrameHdrSec.setOutputFileOffset(EHFrameHdrFileOffset);
57215723
EHFrameHdrSec.setOutputAddress(EHFrameHdrOutputAddress);
5722-
EHFrameHdrSec.setOutputName(".eh_frame_hdr");
5724+
EHFrameHdrSec.setOutputName(getEHFrameHdrSectionName());
57235725

57245726
NextAvailableAddress += EHFrameHdrSec.getOutputSize();
57255727

0 commit comments

Comments
 (0)