This is an archive of the discontinued LLVM Phabricator instance.

Differential D104027

[lld/mac] Use sectionType() more
ClosedPublic

Authored by thakis on Jun 10 2021, 5:59 AM.

Details

Reviewers
int3
gkm
Group Reviewers
Restricted Project
Commits
rGf2b1a1e10c5a: [lld/mac] Use sectionType() more
Summary

Not sure sectionType() carries its weight, but while we have it
we should use it consistently.

No behavior change.

Diff Detail

Event Timeline

thakis created this revision.Jun 10 2021, 5:59 AM
Herald added a reviewer: int3. · View Herald TranscriptJun 10 2021, 5:59 AM
Herald added a reviewer: gkm. · View Herald Transcript
Herald added a project: Restricted Project. · View Herald Transcript
thakis requested review of this revision.Jun 10 2021, 5:59 AM
Harbormaster completed remote builds in B108605: Diff 351146.Jun 10 2021, 6:45 AM
int3 accepted this revision.Jun 10 2021, 12:13 PM

Thanks!

This revision is now accepted and ready to land.Jun 10 2021, 12:13 PM
Closed by commit rGf2b1a1e10c5a: [lld/mac] Use sectionType() more (authored by thakis). · Explain WhyJun 11 2021, 8:16 AM
This revision was automatically updated to reflect the committed changes.
thakis added a commit: rGf2b1a1e10c5a: [lld/mac] Use sectionType() more.
Herald added a project: Restricted Project. · View Herald TranscriptJun 11 2021, 8:16 AM

Revision Contents

PathSize
lld/
MachO/
4 lines
2 lines

Diff 351146

lld/MachO/ConcatOutputSection.cpp

Show First 20 Lines • Show All 333 Lines • ▼ Show 20 Lines while (i < ie || t < te) {
} }
} }
} }
// TODO: this is most likely wrong; reconsider how section flags // TODO: this is most likely wrong; reconsider how section flags
// are actually merged. The logic presented here was written without // are actually merged. The logic presented here was written without
// any form of informed research. // any form of informed research.
void ConcatOutputSection::mergeFlags(InputSection *input) { void ConcatOutputSection::mergeFlags(InputSection *input) {
uint8_t baseType = flags & SECTION_TYPE; uint8_t baseType = sectionType(flags);
uint8_t inputType = input->flags & SECTION_TYPE; uint8_t inputType = sectionType(input->flags);
if (baseType != inputType) if (baseType != inputType)
error("Cannot merge section " + input->name + " (type=0x" + error("Cannot merge section " + input->name + " (type=0x" +
to_hexString(inputType) + ") into " + name + " (type=0x" + to_hexString(inputType) + ") into " + name + " (type=0x" +
to_hexString(baseType) + "): inconsistent types"); to_hexString(baseType) + "): inconsistent types");
constexpr uint32_t strictFlags = S_ATTR_DEBUG | S_ATTR_STRIP_STATIC_SYMS | constexpr uint32_t strictFlags = S_ATTR_DEBUG | S_ATTR_STRIP_STATIC_SYMS |
S_ATTR_NO_DEAD_STRIP | S_ATTR_LIVE_SUPPORT; S_ATTR_NO_DEAD_STRIP | S_ATTR_LIVE_SUPPORT;
if ((input->flags ^ flags) & strictFlags) if ((input->flags ^ flags) & strictFlags)
Show All 11 Lines

lld/MachO/InputSection.cpp

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines
uint64_t CStringInputSection::getOffset(uint64_t off) const { uint64_t CStringInputSection::getOffset(uint64_t off) const {
const StringPiece &piece = getStringPiece(off); const StringPiece &piece = getStringPiece(off);
uint64_t addend = off - piece.inSecOff; uint64_t addend = off - piece.inSecOff;
return piece.outSecOff + addend; return piece.outSecOff + addend;
} }
bool macho::isCodeSection(const InputSection *isec) { bool macho::isCodeSection(const InputSection *isec) {
uint32_t type = isec->flags & SECTION_TYPE; uint32_t type = sectionType(isec->flags);
if (type != S_REGULAR && type != S_COALESCED) if (type != S_REGULAR && type != S_COALESCED)
return false; return false;
uint32_t attr = isec->flags & SECTION_ATTRIBUTES_USR; uint32_t attr = isec->flags & SECTION_ATTRIBUTES_USR;
if (attr == S_ATTR_PURE_INSTRUCTIONS) if (attr == S_ATTR_PURE_INSTRUCTIONS)
return true; return true;
if (isec->segname == segment_names::text) if (isec->segname == segment_names::text)
Show All 10 Lines