Skip to content

Commit

Permalink
[ELF] - Teach LLD to hint about -fdebug-types-section.
Browse files Browse the repository at this point in the history
Patch teaches LLD to hint user about -fdebug-types-section flag
if relocation overflow happens in debug section.

Differential revision: https://reviews.llvm.org/D40954

llvm-svn: 328081
  • Loading branch information
George Rimar committed Mar 21, 2018
1 parent 2b88406 commit 89481f3
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 12 deletions.
16 changes: 8 additions & 8 deletions lld/ELF/Target.cpp
Expand Up @@ -87,29 +87,29 @@ TargetInfo *elf::getTarget() {
fatal("unknown target machine");
}

template <class ELFT> static std::string getErrorLoc(const uint8_t *Loc) {
template <class ELFT> static ErrorPlace getErrPlace(const uint8_t *Loc) {
for (InputSectionBase *D : InputSections) {
auto *IS = dyn_cast<InputSection>(D);
if (!IS || !IS->getParent())
continue;

uint8_t *ISLoc = IS->getParent()->Loc + IS->OutSecOff;
if (ISLoc <= Loc && Loc < ISLoc + IS->getSize())
return IS->template getLocation<ELFT>(Loc - ISLoc) + ": ";
return {IS, IS->template getLocation<ELFT>(Loc - ISLoc) + ": "};
}
return "";
return {};
}

std::string elf::getErrorLocation(const uint8_t *Loc) {
ErrorPlace elf::getErrorPlace(const uint8_t *Loc) {
switch (Config->EKind) {
case ELF32LEKind:
return getErrorLoc<ELF32LE>(Loc);
return getErrPlace<ELF32LE>(Loc);
case ELF32BEKind:
return getErrorLoc<ELF32BE>(Loc);
return getErrPlace<ELF32BE>(Loc);
case ELF64LEKind:
return getErrorLoc<ELF64LE>(Loc);
return getErrPlace<ELF64LE>(Loc);
case ELF64BEKind:
return getErrorLoc<ELF64BE>(Loc);
return getErrPlace<ELF64BE>(Loc);
default:
llvm_unreachable("unknown ELF type");
}
Expand Down
24 changes: 20 additions & 4 deletions lld/ELF/Target.h
Expand Up @@ -143,7 +143,17 @@ TargetInfo *getX86TargetInfo();
TargetInfo *getX86_64TargetInfo();
template <class ELFT> TargetInfo *getMipsTargetInfo();

std::string getErrorLocation(const uint8_t *Loc);
struct ErrorPlace {
InputSectionBase *IS;
std::string Loc;
};

// Returns input section and corresponding source string for the given location.
ErrorPlace getErrorPlace(const uint8_t *Loc);

static inline std::string getErrorLocation(const uint8_t *Loc) {
return getErrorPlace(Loc).Loc;
}

uint64_t getPPC64TocBase();
uint64_t getAArch64Page(uint64_t Expr);
Expand All @@ -155,9 +165,15 @@ template <class ELFT> bool isMipsPIC(const Defined *Sym);

static inline void reportRangeError(uint8_t *Loc, RelType Type, const Twine &V,
int64_t Min, uint64_t Max) {
error(getErrorLocation(Loc) + "relocation " + lld::toString(Type) +
" out of range: " + V + " is not in [" + Twine(Min) + ", " +
Twine(Max) + "]");
ErrorPlace ErrPlace = getErrorPlace(Loc);
StringRef Hint;
if (ErrPlace.IS && ErrPlace.IS->Name.startswith(".debug"))
Hint = "; consider recompiling with -fdebug-types-section to reduce size "
"of debug sections";

error(ErrPlace.Loc + "relocation " + lld::toString(Type) +
" out of range: " + V.str() + " is not in [" + Twine(Min).str() + ", " +
Twine(Max).str() + "]" + Hint);
}

template <unsigned N>
Expand Down
9 changes: 9 additions & 0 deletions lld/test/ELF/x86-64-reloc-debug-overflow.s
@@ -0,0 +1,9 @@
# REQUIRES: x86
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-error.s -o %tabs
# RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
# RUN: not ld.lld -shared %tabs %t -o %t2 2>&1 | FileCheck %s

# CHECK: (.debug_info+0x0): relocation R_X86_64_32 out of range: 281474976710656 is not in [0, 4294967295]; consider recompiling with -fdebug-types-section to reduce size of debug sections

.section .debug_info,"",@progbits
.long .debug_info + 0x1000000000000

0 comments on commit 89481f3

Please sign in to comment.