This is an archive of the discontinued LLVM Phabricator instance.

Differential D145571

[LLDB][ObjectFileELF] Correct the return type of Reloc{Offset,Addend}32
ClosedPublic

Authored by SixWeining on Mar 8 2023, 3:40 AM.

Details

Reviewers
DavidSpickett
Commits
rG27705f456a3a: [LLDB][ObjectFileELF] Correct the return type of Reloc{Offset,Addend}32
Summary

This is a follow up of D145550.

I think Reloc{Type,Symbol}{32,64} can keep unchanged as they are not
directly returning a field of the ELFRel[a] struct.

Depends on D145550.

Diff Detail

Event Timeline

SixWeining created this revision.Mar 8 2023, 3:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 8 2023, 3:40 AM
Herald added a subscriber: emaste. · View Herald Transcript
SixWeining requested review of this revision.Mar 8 2023, 3:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 8 2023, 3:40 AM
Herald added subscribers: lldb-commits, MaskRay. · View Herald Transcript
Harbormaster completed remote builds in B218050: Diff 503301.Mar 8 2023, 3:43 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptMar 8 2023, 3:43 AM
DavidSpickett accepted this revision.Mar 8 2023, 3:43 AM

Thanks!

This revision is now accepted and ready to land.Mar 8 2023, 3:43 AM
Closed by commit rG27705f456a3a: [LLDB][ObjectFileELF] Correct the return type of Reloc{Offset,Addend}32 (authored by SixWeining). · Explain WhyMar 13 2023, 1:24 AM
This revision was automatically updated to reflect the committed changes.
SixWeining added a commit: rG27705f456a3a: [LLDB][ObjectFileELF] Correct the return type of Reloc{Offset,Addend}32.

Revision Contents

PathSize
lldb/
source/
Plugins/
ObjectFile/
ELF/
8 lines

Diff 503301

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linespublic:
static unsigned RelocType32(const ELFRelocation &rel); static unsigned RelocType32(const ELFRelocation &rel);
static unsigned RelocType64(const ELFRelocation &rel); static unsigned RelocType64(const ELFRelocation &rel);
static unsigned RelocSymbol32(const ELFRelocation &rel); static unsigned RelocSymbol32(const ELFRelocation &rel);
static unsigned RelocSymbol64(const ELFRelocation &rel); static unsigned RelocSymbol64(const ELFRelocation &rel);
static unsigned RelocOffset32(const ELFRelocation &rel); static elf_addr RelocOffset32(const ELFRelocation &rel);
static elf_addr RelocOffset64(const ELFRelocation &rel); static elf_addr RelocOffset64(const ELFRelocation &rel);
static unsigned RelocAddend32(const ELFRelocation &rel); static elf_sxword RelocAddend32(const ELFRelocation &rel);
static elf_sxword RelocAddend64(const ELFRelocation &rel); static elf_sxword RelocAddend64(const ELFRelocation &rel);
bool IsRela() { return (reloc.is<ELFRela *>()); } bool IsRela() { return (reloc.is<ELFRela *>()); }
private: private:
typedef llvm::PointerUnion<ELFRel *, ELFRela *> RelocUnion; typedef llvm::PointerUnion<ELFRel *, ELFRela *> RelocUnion;
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Lines
unsigned ELFRelocation::RelocSymbol64(const ELFRelocation &rel) { unsigned ELFRelocation::RelocSymbol64(const ELFRelocation &rel) {
if (rel.reloc.is<ELFRel *>()) if (rel.reloc.is<ELFRel *>())
return ELFRel::RelocSymbol64(*rel.reloc.get<ELFRel *>()); return ELFRel::RelocSymbol64(*rel.reloc.get<ELFRel *>());
else else
return ELFRela::RelocSymbol64(*rel.reloc.get<ELFRela *>()); return ELFRela::RelocSymbol64(*rel.reloc.get<ELFRela *>());
} }
unsigned ELFRelocation::RelocOffset32(const ELFRelocation &rel) { elf_addr ELFRelocation::RelocOffset32(const ELFRelocation &rel) {
if (rel.reloc.is<ELFRel *>()) if (rel.reloc.is<ELFRel *>())
return rel.reloc.get<ELFRel *>()->r_offset; return rel.reloc.get<ELFRel *>()->r_offset;
else else
return rel.reloc.get<ELFRela *>()->r_offset; return rel.reloc.get<ELFRela *>()->r_offset;
} }
elf_addr ELFRelocation::RelocOffset64(const ELFRelocation &rel) { elf_addr ELFRelocation::RelocOffset64(const ELFRelocation &rel) {
if (rel.reloc.is<ELFRel *>()) if (rel.reloc.is<ELFRel *>())
return rel.reloc.get<ELFRel *>()->r_offset; return rel.reloc.get<ELFRel *>()->r_offset;
else else
return rel.reloc.get<ELFRela *>()->r_offset; return rel.reloc.get<ELFRela *>()->r_offset;
} }
unsigned ELFRelocation::RelocAddend32(const ELFRelocation &rel) { elf_sxword ELFRelocation::RelocAddend32(const ELFRelocation &rel) {
if (rel.reloc.is<ELFRel *>()) if (rel.reloc.is<ELFRel *>())
return 0; return 0;
else else
return rel.reloc.get<ELFRela *>()->r_addend; return rel.reloc.get<ELFRela *>()->r_addend;
} }
elf_sxword ELFRelocation::RelocAddend64(const ELFRelocation &rel) { elf_sxword ELFRelocation::RelocAddend64(const ELFRelocation &rel) {
if (rel.reloc.is<ELFRel *>()) if (rel.reloc.is<ELFRel *>())
▲ Show 20 Lines • Show All 3,295 Lines • Show Last 20 Lines