This is an archive of the discontinued LLVM Phabricator instance.

Differential D122239

[dsymutil] Update vector of section starts with size of current section
ClosedPublic

Authored by augusto2112 on Mar 22 2022, 10:20 AM.

Details

Reviewers
aprantl
JDevlieghere
Commits
rG44a609cd594f: [dsymutil] Update vector of section starts with size of current section
Summary

Take into account the contributions of the sections from different
object files when calculating the address where relocations should be
applied.

Diff Detail

Event Timeline

augusto2112 created this revision.Mar 22 2022, 10:20 AM
Herald added a reviewer: JDevlieghere. · View Herald TranscriptMar 22 2022, 10:20 AM
Herald added a project: Restricted Project. · View Herald Transcript
augusto2112 requested review of this revision.Mar 22 2022, 10:20 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 22 2022, 10:20 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B155652: Diff 417334.Mar 22 2022, 11:10 AM
aprantl accepted this revision.Mar 22 2022, 2:54 PM

That looks plausible. Does this affect any of the tests?

This revision is now accepted and ready to land.Mar 22 2022, 2:54 PM
augusto2112 added a comment.Mar 23 2022, 5:36 AM
In D122239#3400774, @aprantl wrote:

That looks plausible. Does this affect any of the tests?

Yes, two swift tests.

augusto2112 updated this revision to Diff 417576.Mar 23 2022, 5:41 AM

Clang format

augusto2112 updated this revision to Diff 417577.Mar 23 2022, 5:42 AM

Clang format

This revision was landed with ongoing or failed builds.Mar 23 2022, 6:16 AM
Closed by commit rG44a609cd594f: [dsymutil] Update vector of section starts with size of current section (authored by augusto2112). · Explain Why
This revision was automatically updated to reflect the committed changes.
augusto2112 added a commit: rG44a609cd594f: [dsymutil] Update vector of section starts with size of current section.
Harbormaster completed remote builds in B155841: Diff 417577.Mar 23 2022, 6:22 AM

Revision Contents

PathSize
llvm/
tools/
dsymutil/
2 lines
6 lines

Diff 417585

llvm/tools/dsymutil/DwarfLinkerForBinary.h

Show First 20 Lines • Show All 208 Lines • ▼ Show 20 Lines void collectRelocationsToApplyToSwiftReflectionSections(
const llvm::object::MachOObjectFile *MO, const llvm::object::MachOObjectFile *MO,
const std::vector<uint64_t> &SectionToOffsetInDwarf, const std::vector<uint64_t> &SectionToOffsetInDwarf,
const llvm::dsymutil::DebugMapObject *Obj, const llvm::dsymutil::DebugMapObject *Obj,
std::vector<MachOUtils::DwarfRelocationApplicationInfo> std::vector<MachOUtils::DwarfRelocationApplicationInfo>
&RelocationsToApply) const; &RelocationsToApply) const;
void copySwiftReflectionMetadata( void copySwiftReflectionMetadata(
const llvm::dsymutil::DebugMapObject *Obj, DwarfStreamer *Streamer, const llvm::dsymutil::DebugMapObject *Obj, DwarfStreamer *Streamer,
const std::vector<uint64_t> &SectionToOffsetInDwarf, std::vector<uint64_t> &SectionToOffsetInDwarf,
std::vector<MachOUtils::DwarfRelocationApplicationInfo> std::vector<MachOUtils::DwarfRelocationApplicationInfo>
&RelocationsToApply); &RelocationsToApply);
raw_fd_ostream &OutFile; raw_fd_ostream &OutFile;
BinaryHolder &BinHolder; BinaryHolder &BinHolder;
LinkOptions Options; LinkOptions Options;
std::unique_ptr<DwarfStreamer> Streamer; std::unique_ptr<DwarfStreamer> Streamer;
std::vector<std::unique_ptr<DWARFFile>> ObjectsForLinking; std::vector<std::unique_ptr<DWARFFile>> ObjectsForLinking;
Show All 18 Lines

llvm/tools/dsymutil/DwarfLinkerForBinary.cpp

Show First 20 Lines • Show All 488 Lines • ▼ Show 20 Lines uint64_t AddressFromDwarfVM =
SectionToOffsetInDwarf[ReflSectionKind] + It->getOffset(); SectionToOffsetInDwarf[ReflSectionKind] + It->getOffset();
RelocationsToApply.emplace_back(AddressFromDwarfVM, Value, RelocationsToApply.emplace_back(AddressFromDwarfVM, Value,
ShouldSubtractDwarfVM); ShouldSubtractDwarfVM);
} }
} }
void DwarfLinkerForBinary::copySwiftReflectionMetadata( void DwarfLinkerForBinary::copySwiftReflectionMetadata(
const llvm::dsymutil::DebugMapObject *Obj, DwarfStreamer *Streamer, const llvm::dsymutil::DebugMapObject *Obj, DwarfStreamer *Streamer,
const std::vector<uint64_t> &SectionToOffsetInDwarf, std::vector<uint64_t> &SectionToOffsetInDwarf,
std::vector<MachOUtils::DwarfRelocationApplicationInfo> std::vector<MachOUtils::DwarfRelocationApplicationInfo>
&RelocationsToApply) { &RelocationsToApply) {
using binaryformat::Swift5ReflectionSectionKind; using binaryformat::Swift5ReflectionSectionKind;
auto OF = auto OF =
llvm::object::ObjectFile::createObjectFile(Obj->getObjectFilename()); llvm::object::ObjectFile::createObjectFile(Obj->getObjectFilename());
if (!OF) { if (!OF) {
llvm::consumeError(OF.takeError()); llvm::consumeError(OF.takeError());
return; return;
Show All 28 Lines for (auto SectionKind : SectionKindsToEmit) {
llvm::Expected<llvm::StringRef> SectionContents = Section.getContents(); llvm::Expected<llvm::StringRef> SectionContents = Section.getContents();
if (!SectionContents) if (!SectionContents)
continue; continue;
const auto *MO = const auto *MO =
llvm::cast<llvm::object::MachOObjectFile>(Section.getObject()); llvm::cast<llvm::object::MachOObjectFile>(Section.getObject());
collectRelocationsToApplyToSwiftReflectionSections( collectRelocationsToApplyToSwiftReflectionSections(
Section, *SectionContents, MO, SectionToOffsetInDwarf, Obj, Section, *SectionContents, MO, SectionToOffsetInDwarf, Obj,
RelocationsToApply); RelocationsToApply);
// Update the section start with the current section's contribution, so
// the next section we copy from a different .o file points to the correct
// place.
SectionToOffsetInDwarf[SectionKind] += Section.getSize();
Streamer->emitSwiftReflectionSection(SectionKind, *SectionContents, Streamer->emitSwiftReflectionSection(SectionKind, *SectionContents,
Section.getAlignment(), Section.getAlignment(),
Section.getSize()); Section.getSize());
} }
} }
} }
bool DwarfLinkerForBinary::link(const DebugMap &Map) { bool DwarfLinkerForBinary::link(const DebugMap &Map) {
▲ Show 20 Lines • Show All 500 Lines • Show Last 20 Lines