shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ELF] Simplify complex diagnostics

Browse Source
This commit is contained in:
Fangrui Song 2024-11-16 19:11:58 -08:00
parent fd9f3beb0f
commit 9664ce6d59
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lld/ELF/Relocations.cpp
View File

@ -100,44 +100,41 @@ static std::string getLocation(Ctx &ctx, InputSectionBase &s, const Symbol &sym,
void elf::reportRangeError(Ctx &ctx, uint8_t *loc, const Relocation &rel,
const Twine &v, int64_t min, uint64_t max) {
ErrorPlace errPlace = getErrorPlace(ctx, loc);
std::string hint;
auto diag = Err(ctx);
diag << errPlace.loc << "relocation " << rel.type
<< " out of range: " << v.str() << " is not in [" << min << ", " << max
<< ']';
if (rel.sym) {
if (!rel.sym->isSection())
hint = "; references '" + toStr(ctx, *rel.sym) + '\'';
diag << "; references '" << rel.sym << '\'';
else if (auto *d = dyn_cast<Defined>(rel.sym))
hint = ("; references section '" + d->section->name + "'").str();
diag << "; references section '" << d->section->name << "'";
if (ctx.arg.emachine == EM_X86_64 && rel.type == R_X86_64_PC32 &&
rel.sym->getOutputSection() &&
(rel.sym->getOutputSection()->flags & SHF_X86_64_LARGE)) {
hint += "; R_X86_64_PC32 should not reference a section marked "
diag << "; R_X86_64_PC32 should not reference a section marked "
"SHF_X86_64_LARGE";
}
}
if (!errPlace.srcLoc.empty())
hint += "\n>>> referenced by " + errPlace.srcLoc;
diag << "\n>>> referenced by " << errPlace.srcLoc;
if (rel.sym && !rel.sym->isSection())
hint += getDefinedLocation(ctx, *rel.sym);
diag << getDefinedLocation(ctx, *rel.sym);
if (errPlace.isec && errPlace.isec->name.starts_with(".debug"))
hint += "; consider recompiling with -fdebug-types-section to reduce size "
diag << "; consider recompiling with -fdebug-types-section to reduce size "
"of debug sections";
Err(ctx) << errPlace.loc << "relocation " << rel.type
<< " out of range: " << v.str() << " is not in [" << Twine(min).str()
<< ", " << Twine(max).str() << "]" << hint;
}
void elf::reportRangeError(Ctx &ctx, uint8_t *loc, int64_t v, int n,
const Symbol &sym, const Twine &msg) {
ErrorPlace errPlace = getErrorPlace(ctx, loc);
std::string hint;
auto diag = Err(ctx);
diag << getErrorPlace(ctx, loc).loc << msg << " is out of range: " << v
<< " is not in [" << llvm::minIntN(n) << ", " << llvm::maxIntN(n) << "]";
if (!sym.getName().empty())
hint = "; references '" + toStr(ctx, sym) + '\'' +
getDefinedLocation(ctx, sym);
Err(ctx) << errPlace.loc << msg << " is out of range: " << Twine(v)
<< " is not in [" << Twine(llvm::minIntN(n)) << ", "
<< Twine(llvm::maxIntN(n)) << "]" << hint;
diag << "; references '" << &sym << '\'' << getDefinedLocation(ctx, sym);
}
// Build a bitmask with one bit set for each 64 subset of RelExpr.

13
lld/ELF/Symbols.cpp
View File

@ -548,15 +548,14 @@ void elf::reportDuplicate(Ctx &ctx, const Symbol &sym, const InputFile *newFile,
std::string src2 = errSec->getSrcMsg(sym, errOffset);
std::string obj2 = errSec->getObjMsg(errOffset);
std::string msg =
"duplicate symbol: " + toStr(ctx, sym) + "\n>>> defined at ";
auto diag = Err(ctx);
diag << "duplicate symbol: " << &sym << "\n>>> defined at ";
if (!src1.empty())
msg += src1 + "\n>>> ";
msg += obj1 + "\n>>> defined at ";
diag << src1 << "\n>>> ";
diag << obj1 << "\n>>> defined at ";
if (!src2.empty())
msg += src2 + "\n>>> ";
msg += obj2;
Err(ctx) << msg;
diag << src2 << "\n>>> ";
diag << obj2;
}
void Symbol::checkDuplicate(Ctx &ctx, const Defined &other) const {