mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-26 00:06:06 +00:00
Code Issues Projects Releases Wiki Activity

[ELF] Change getLocation to use ELFSyncStream. NFC

Browse Source
This commit is contained in:
Fangrui Song 2024-11-24 11:16:52 -08:00
parent 0dbdc6dc35
commit d8495ede01
1 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
lld/ELF/Relocations.cpp
View File

@ -74,13 +74,12 @@ static std::optional<std::string> getLinkerScriptLocation(Ctx &ctx,
return std::nullopt;
}
static std::string getDefinedLocation(Ctx &ctx, const Symbol &sym) {
const char msg[] = "\n>>> defined in ";
static void printDefinedLocation(ELFSyncStream &s, const Symbol &sym) {
s << "\n>>> defined in ";
if (sym.file)
return msg + toStr(ctx, sym.file);
if (std::optional<std::string> loc = getLinkerScriptLocation(ctx, sym))
return msg + *loc;
return "";
return void(s << sym.file);
if (std::optional<std::string> loc = getLinkerScriptLocation(s.ctx, sym))
return void(s << *loc);
}
// Construct a message in the following format.
@ -88,13 +87,14 @@ static std::string getDefinedLocation(Ctx &ctx, const Symbol &sym) {
// >>> defined in /home/alice/src/foo.o
// >>> referenced by bar.c:12 (/home/alice/src/bar.c:12)
// >>> /home/alice/src/bar.o:(.text+0x1)
static std::string getLocation(Ctx &ctx, InputSectionBase &s, const Symbol &sym,
uint64_t off) {
std::string msg = getDefinedLocation(ctx, sym) + "\n>>> referenced by ";
std::string src = s.getSrcMsg(sym, off);
static void printLocation(ELFSyncStream &s, InputSectionBase &sec,
const Symbol &sym, uint64_t off) {
printDefinedLocation(s, sym);
s << "\n>>> referenced by ";
std::string src = sec.getSrcMsg(sym, off);
if (!src.empty())
msg += src + "\n>>> ";
return msg + s.getObjMsg(off);
s << src << "\n>>> ";
s << sec.getObjMsg(off);
}
void elf::reportRangeError(Ctx &ctx, uint8_t *loc, const Relocation &rel,
@ -121,7 +121,7 @@ void elf::reportRangeError(Ctx &ctx, uint8_t *loc, const Relocation &rel,
if (!errPlace.srcLoc.empty())
diag << "\n>>> referenced by " << errPlace.srcLoc;
if (rel.sym && !rel.sym->isSection())
diag << getDefinedLocation(ctx, *rel.sym);
printDefinedLocation(diag, *rel.sym);
if (errPlace.isec && errPlace.isec->name.starts_with(".debug"))
diag << "; consider recompiling with -fdebug-types-section to reduce size "
@ -133,8 +133,10 @@ void elf::reportRangeError(Ctx &ctx, uint8_t *loc, int64_t v, int n,
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())
diag << "; references '" << &sym << '\'' << getDefinedLocation(ctx, sym);
if (!sym.getName().empty()) {
diag << "; references '" << &sym << '\'';
printDefinedLocation(diag, sym);
}
}
// Build a bitmask with one bit set for each 64 subset of RelExpr.
@ -546,8 +548,8 @@ static void maybeReportDiscarded(Ctx &ctx, ELFSyncStream &msg, Undefined &sym) {
StringRef signature = file->getShtGroupSignature(objSections, elfSec);
if (const InputFile *prevailing =
ctx.symtab->comdatGroups.lookup(CachedHashStringRef(signature))) {
msg << "\n>>> section group signature: "
<< signature.str() + "\n>>> prevailing definition is in " << prevailing;
msg << "\n>>> section group signature: " << signature
<< "\n>>> prevailing definition is in " << prevailing;
if (sym.nonPrevailing) {
msg << "\n>>> or the symbol in the prevailing group had STB_WEAK "
"binding and the symbol in a non-prevailing group had STB_GLOBAL "
@ -1013,9 +1015,9 @@ bool RelocationScanner::isStaticLinkTimeConstant(RelExpr e, RelType type,
if (sym.scriptDefined)
return true;
Err(ctx) << "relocation " << type
<< " cannot refer to absolute symbol: " << &sym
<< getLocation(ctx, *sec, sym, relOff);
auto diag = Err(ctx);
diag << "relocation " << type << " cannot refer to absolute symbol: " << &sym;
printLocation(diag, *sec, sym, relOff);
return true;
}
@ -1181,18 +1183,21 @@ void RelocationScanner::processAux(RelExpr expr, RelType type, uint64_t offset,
if (!ctx.arg.shared && sym.isShared() &&
!(ctx.arg.emachine == EM_AARCH64 && type == R_AARCH64_AUTH_ABS64)) {
if (!canDefineSymbolInExecutable(ctx, sym)) {
Err(ctx) << "cannot preempt symbol: " << &sym
<< getLocation(ctx, *sec, sym, offset);
auto diag = Err(ctx);
diag << "cannot preempt symbol: " << &sym;
printLocation(diag, *sec, sym, offset);
return;
}
if (sym.isObject()) {
// Produce a copy relocation.
if (auto *ss = dyn_cast<SharedSymbol>(&sym)) {
if (!ctx.arg.zCopyreloc)
Err(ctx) << "unresolvable relocation " << type << " against symbol '"
<< ss << "'; recompile with -fPIC or remove '-z nocopyreloc'"
<< getLocation(ctx, *sec, sym, offset);
if (!ctx.arg.zCopyreloc) {
auto diag = Err(ctx);
diag << "unresolvable relocation " << type << " against symbol '"
<< ss << "'; recompile with -fPIC or remove '-z nocopyreloc'";
printLocation(diag, *sec, sym, offset);
}
sym.setFlags(NEEDS_COPY);
}
sec->addReloc({expr, type, offset, addend, &sym});
@ -1227,20 +1232,26 @@ void RelocationScanner::processAux(RelExpr expr, RelType type, uint64_t offset,
// * If a library definition gets preempted to the executable, it will have
// the wrong ebx value.
if (sym.isFunc()) {
if (ctx.arg.pie && ctx.arg.emachine == EM_386)
Err(ctx) << "symbol '" << &sym
<< "' cannot be preempted; recompile with -fPIE"
<< getLocation(ctx, *sec, sym, offset);
if (ctx.arg.pie && ctx.arg.emachine == EM_386) {
auto diag = Err(ctx);
diag << "symbol '" << &sym
<< "' cannot be preempted; recompile with -fPIE";
printLocation(diag, *sec, sym, offset);
}
sym.setFlags(NEEDS_COPY | NEEDS_PLT);
sec->addReloc({expr, type, offset, addend, &sym});
return;
}
}
Err(ctx) << "relocation " << type << " cannot be used against "
<< (sym.getName().empty() ? "local symbol"
: ("symbol '" + toStr(ctx, sym) + "'"))
<< "; recompile with -fPIC" << getLocation(ctx, *sec, sym, offset);
auto diag = Err(ctx);
diag << "relocation " << type << " cannot be used against ";
if (sym.getName().empty())
diag << "local symbol";
else
diag << "symbol '" << &sym << "'";
diag << "; recompile with -fPIC";
printLocation(diag, *sec, sym, offset);
}
// This function is similar to the `handleTlsRelocation`. MIPS does not
@ -1277,9 +1288,10 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
int64_t addend) {
if (expr == R_TPREL || expr == R_TPREL_NEG) {
if (ctx.arg.shared) {
Err(ctx) << "relocation " << type << " against " << &sym
<< " cannot be used with -shared"
<< getLocation(ctx, *sec, sym, offset);
auto diag = Err(ctx);
diag << "relocation " << type << " against " << &sym
<< " cannot be used with -shared";
printLocation(diag, *sec, sym, offset);
return 1;
}
return 0;
@ -1486,9 +1498,10 @@ void RelocationScanner::scanOne(typename Relocs<RelTy>::const_iterator &i) {
// Skip the error check for CREL, which does not set `end`.
if constexpr (!RelTy::IsCrel) {
if (i == end) {
Err(ctx) << "R_PPC64_TLSGD/R_PPC64_TLSLD may not be the last "
"relocation"
<< getLocation(ctx, *sec, sym, offset);
auto diag = Err(ctx);
diag << "R_PPC64_TLSGD/R_PPC64_TLSLD may not be the last "
"relocation";
printLocation(diag, *sec, sym, offset);
return;
}
}