This is an archive of the discontinued LLVM Phabricator instance.

Differential D98648

[lld-macho] Place LC_FUNCTION_STARTS data at the right position
ClosedPublic

Authored by int3 on Mar 15 2021, 11:12 AM.

Details

Reviewers
smeenai
Group Reviewers
Restricted Project
Commits
rG29d46760599b: [lld-macho] Place LC_FUNCTION_STARTS data at the right position
Summary

This pleases the codesign

(Otherwise it complains about "function starts data out of place")

Diff Detail

Event Timeline

int3 created this revision.Mar 15 2021, 11:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2021, 11:12 AM
int3 requested review of this revision.Mar 15 2021, 11:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 15 2021, 11:12 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
int3 retitled this revision from [lld-macho] Place LC_FUNCTION_STARTS at the right position to [lld-macho] Place LC_FUNCTION_STARTS data at the right position.Mar 15 2021, 11:12 AM
smeenai accepted this revision.Mar 15 2021, 11:30 AM
smeenai added a subscriber: smeenai.

LGTM

This revision is now accepted and ready to land.Mar 15 2021, 11:30 AM
This revision was landed with ongoing or failed builds.Mar 15 2021, 11:56 AM
Closed by commit rG29d46760599b: [lld-macho] Place LC_FUNCTION_STARTS data at the right position (authored by int3). · Explain Why
This revision was automatically updated to reflect the committed changes.
int3 added a commit: rG29d46760599b: [lld-macho] Place LC_FUNCTION_STARTS data at the right position.
Harbormaster completed remote builds in B93863: Diff 330736.Mar 15 2021, 12:06 PM

Revision Contents

PathSize
lld/
MachO/
11 lines
test/
MachO/
6 lines

Diff 330752

lld/MachO/Writer.cpp

Show First 20 Lines • Show All 665 Lines • ▼ Show 20 Lines if (segname == segment_names::text) {
default: default:
return StringSwitch<int>(osec->name) return StringSwitch<int>(osec->name)
.Case(section_names::laSymbolPtr, -2) .Case(section_names::laSymbolPtr, -2)
.Case(section_names::data, -1) .Case(section_names::data, -1)
.Default(0); .Default(0);
} }
} else if (segname == segment_names::linkEdit) { } else if (segname == segment_names::linkEdit) {
return StringSwitch<int>(osec->name) return StringSwitch<int>(osec->name)
.Case(section_names::rebase, -8) .Case(section_names::rebase, -9)
.Case(section_names::binding, -7) .Case(section_names::binding, -8)
.Case(section_names::weakBinding, -6) .Case(section_names::weakBinding, -7)
.Case(section_names::lazyBinding, -5) .Case(section_names::lazyBinding, -6)
.Case(section_names::export_, -4) .Case(section_names::export_, -5)
.Case(section_names::functionStarts, -4)
.Case(section_names::symbolTable, -3) .Case(section_names::symbolTable, -3)
.Case(section_names::indirectSymbolTable, -2) .Case(section_names::indirectSymbolTable, -2)
.Case(section_names::stringTable, -1) .Case(section_names::stringTable, -1)
.Case(section_names::codeSignature, std::numeric_limits<int>::max()) .Case(section_names::codeSignature, std::numeric_limits<int>::max())
.Default(0); .Default(0);
} }
// ZeroFill sections must always be the at the end of their segments, // ZeroFill sections must always be the at the end of their segments,
// otherwise subsequent sections may get overwritten with zeroes at runtime. // otherwise subsequent sections may get overwritten with zeroes at runtime.
▲ Show 20 Lines • Show All 232 Lines • Show Last 20 Lines

lld/test/MachO/linkedit-contiguity.s

Show All 24 Lines
# CHECK-NEXT: rebase_size 0 # CHECK-NEXT: rebase_size 0
# CHECK-NEXT: bind_off [[#BIND_OFF:]] # CHECK-NEXT: bind_off [[#BIND_OFF:]]
# CHECK-NEXT: bind_size [[#BIND_SIZE:]] # CHECK-NEXT: bind_size [[#BIND_SIZE:]]
# CHECK-NEXT: weak_bind_off 0 # CHECK-NEXT: weak_bind_off 0
# CHECK-NEXT: weak_bind_size 0 # CHECK-NEXT: weak_bind_size 0
# CHECK-NEXT: lazy_bind_off [[#LAZY_OFF: BIND_OFF + BIND_SIZE]] # CHECK-NEXT: lazy_bind_off [[#LAZY_OFF: BIND_OFF + BIND_SIZE]]
# CHECK-NEXT: lazy_bind_size [[#LAZY_SIZE:]] # CHECK-NEXT: lazy_bind_size [[#LAZY_SIZE:]]
# CHECK-NEXT: export_off [[#EXPORT_OFF: LAZY_OFF + LAZY_SIZE]] # CHECK-NEXT: export_off [[#EXPORT_OFF: LAZY_OFF + LAZY_SIZE]]
# CHECK-NEXT: export_size [[#]] # CHECK-NEXT: export_size [[#EXPORT_SIZE:]]
# CHECK: cmd LC_FUNCTION_STARTS
# CHECK-NEXT: cmdsize
# CHECK-NEXT: dataoff [[#FUNCSTARTS_OFF: EXPORT_OFF + EXPORT_SIZE]]
.text .text
.globl _main .globl _main
_main: _main:
sub $8, %rsp # 16-byte-align the stack; dyld checks for this sub $8, %rsp # 16-byte-align the stack; dyld checks for this
callq _print_hello callq _print_hello
add $8, %rsp add $8, %rsp
ret ret