This is an archive of the discontinued LLVM Phabricator instance.

[lld-macho] Simplify base address calculation for init offsets (NFC)
ClosedPublic

Authored by BertalanD on Sep 16 2022, 9:57 AM.

Download Raw Diff

Details

Reviewers

ributzka
thakis
int3

Group Reviewers

Restricted Project

Diff Detail

Event Timeline

BertalanD created this revision.Sep 16 2022, 9:57 AM

Herald added a reviewer: ributzka. · View Herald TranscriptSep 16 2022, 9:57 AM

Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript

BertalanD requested review of this revision.Sep 16 2022, 9:57 AM

Harbormaster completed remote builds in B187175: Diff 460809.Sep 16 2022, 10:19 AM

thakis accepted this revision.Sep 16 2022, 12:38 PM

This revision is now accepted and ready to land.Sep 16 2022, 12:38 PM

oh nice thanks for cleaning this up

Submitted in 3493f1a10791.

Revision Contents

Path

Size

lld/

MachO/

SyntheticSections.cpp

9 lines

Diff 460809

lld/MachO/SyntheticSections.cpp

	Show First 20 Lines • Show All 1,826 Lines • ▼ Show 20 Lines
	uint64_t InitOffsetsSection::getSize() const {			uint64_t InitOffsetsSection::getSize() const {
	size_t count = 0;			size_t count = 0;
	for (const ConcatInputSection *isec : sections)			for (const ConcatInputSection *isec : sections)
	count += isec->relocs.size();			count += isec->relocs.size();
	return count * sizeof(uint32_t);			return count * sizeof(uint32_t);
	}			}

	void InitOffsetsSection::writeTo(uint8_t *buf) const {			void InitOffsetsSection::writeTo(uint8_t *buf) const {
	uint64_t textVA = 0;
	for (const OutputSegment *oseg : outputSegments)
	if (oseg->name == segment_names::text) {
	textVA = oseg->addr;
	break;
	}

	// FIXME: Add function specified by -init when that argument is implemented.			// FIXME: Add function specified by -init when that argument is implemented.
	for (ConcatInputSection *isec : sections) {			for (ConcatInputSection *isec : sections) {
	for (const Reloc &rel : isec->relocs) {			for (const Reloc &rel : isec->relocs) {
	const Symbol referent = rel.referent.dyn_cast<Symbol >();			const Symbol referent = rel.referent.dyn_cast<Symbol >();
	assert(referent && "section relocation should have been rejected");			assert(referent && "section relocation should have been rejected");
	uint64_t offset = referent->getVA() - textVA;			uint64_t offset = referent->getVA() - in.header->addr;
	// FIXME: Can we handle this gracefully?			// FIXME: Can we handle this gracefully?
	if (offset > UINT32_MAX)			if (offset > UINT32_MAX)
	fatal(isec->getLocation(rel.offset) + ": offset to initializer " +			fatal(isec->getLocation(rel.offset) + ": offset to initializer " +
	referent->getName() + " (" + utohexstr(offset) +			referent->getName() + " (" + utohexstr(offset) +
	") does not fit in 32 bits");			") does not fit in 32 bits");

	// Entries need to be added in the order they appear in the section, but			// Entries need to be added in the order they appear in the section, but
	// relocations aren't guaranteed to be sorted.			// relocations aren't guaranteed to be sorted.
	▲ Show 20 Lines • Show All 88 Lines • Show Last 20 Lines