maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF] Avoid mutable addend parameter. NFC

This commit is contained in:
Fangrui Song 2021-12-12 19:12:01 -08:00
parent 5fadb39e9b
commit a8024dfc06
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/Symbols.cpp
View File

@ -67,7 +67,7 @@ DenseMap<const Symbol *, std::pair<const InputFile *, const InputFile *>>
SmallVector<std::tuple<std::string, const InputFile *, const Symbol &>, 0> SmallVector<std::tuple<std::string, const InputFile *, const Symbol &>, 0>
elf::whyExtract; elf::whyExtract;
static uint64_t getSymVA(const Symbol &sym, int64_t &addend) { static uint64_t getSymVA(const Symbol &sym, int64_t addend) {
switch (sym.kind()) { switch (sym.kind()) {
case Symbol::DefinedKind: { case Symbol::DefinedKind: {
auto &d = cast<Defined>(sym); auto &d = cast<Defined>(sym);
@ -93,10 +93,8 @@ static uint64_t getSymVA(const Symbol &sym, int64_t &addend) {
// To make this work, we incorporate the addend into the section // To make this work, we incorporate the addend into the section
// offset (and zero out the addend for later processing) so that // offset (and zero out the addend for later processing) so that
// we find the right object in the section. // we find the right object in the section.
if (d.isSection()) { if (d.isSection())
offset += addend; offset += addend;
addend = 0;
}
// In the typical case, this is actually very simple and boils // In the typical case, this is actually very simple and boils
// down to adding together 3 numbers: // down to adding together 3 numbers:
@ -109,6 +107,8 @@ static uint64_t getSymVA(const Symbol &sym, int64_t &addend) {
// line (and how they get built), then you have a pretty good // line (and how they get built), then you have a pretty good
// understanding of the linker. // understanding of the linker.
uint64_t va = isec->getVA(offset); uint64_t va = isec->getVA(offset);
if (d.isSection())
va -= addend;
// MIPS relocatable files can mix regular and microMIPS code. // MIPS relocatable files can mix regular and microMIPS code.
// Linker needs to distinguish such code. To do so microMIPS // Linker needs to distinguish such code. To do so microMIPS
@ -152,8 +152,7 @@ static uint64_t getSymVA(const Symbol &sym, int64_t &addend) {
} }
uint64_t Symbol::getVA(int64_t addend) const { uint64_t Symbol::getVA(int64_t addend) const {
uint64_t outVA = getSymVA(*this, addend); return getSymVA(*this, addend) + addend;
return outVA + addend;
} }
uint64_t Symbol::getGotVA() const { uint64_t Symbol::getGotVA() const {