Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-25 23:00:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix ELFObjectWriter::isLocal for signature symbols.

Browse Source 
And with that simplify the logic for inserting them in ExternalSymbolData or
LocalSymbolData.

No functionality change overall since the old code avoided the isLocal bug.

llvm-svn: 238555
This commit is contained in:
Rafael Espindola 2015-05-29 14:20:40 +00:00
parent b45fb36f20
commit 10d238751e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/MC/ELFObjectWriter.cpp
View File

@ -74,7 +74,8 @@ class ELFObjectWriter : public MCObjectWriter {
static uint64_t SymbolValue(const MCSymbol &Sym, const MCAsmLayout &Layout);
static bool isInSymtab(const MCAsmLayout &Layout, const MCSymbol &Symbol,
bool Used, bool Renamed);
static bool isLocal(const MCSymbol &Symbol, bool isUsedInReloc);
static bool isLocal(const MCSymbol &Symbol, bool IsUsedInReloc,
bool IsSignature);
/// Helper struct for containing some precomputed information on symbols.
struct ELFSymbolData {
@ -766,7 +767,8 @@ bool ELFObjectWriter::isInSymtab(const MCAsmLayout &Layout,
return true;
}
bool ELFObjectWriter::isLocal(const MCSymbol &Symbol, bool isUsedInReloc) {
bool ELFObjectWriter::isLocal(const MCSymbol &Symbol, bool IsUsedInReloc,
bool IsSignature) {
const MCSymbolData &Data = Symbol.getData();
if (Data.isExternal())
return false;
@ -774,10 +776,10 @@ bool ELFObjectWriter::isLocal(const MCSymbol &Symbol, bool isUsedInReloc) {
if (Symbol.isDefined())
return true;
if (isUsedInReloc)
if (IsUsedInReloc)
return false;
return true;
return IsSignature;
}
void ELFObjectWriter::computeSymbolTable(
@ -825,7 +827,7 @@ void ELFObjectWriter::computeSymbolTable(
// Undefined symbols are global, but this is the first place we
// are able to set it.
bool Local = isLocal(Symbol, Used);
bool Local = isLocal(Symbol, Used, isSignature);
if (!Local && MCELF::GetBinding(SD) == ELF::STB_LOCAL) {
assert(BaseSymbol);
MCSymbolData &BaseData = BaseSymbol->getData();
@ -900,9 +902,7 @@ void ELFObjectWriter::computeSymbolTable(
if (MCELF::GetType(SD) != ELF::STT_SECTION)
MSD.Name = StrTabBuilder.add(Name);
if (MSD.SectionIndex == ELF::SHN_UNDEF)
ExternalSymbolData.push_back(MSD);
else if (Local)
if (Local)
LocalSymbolData.push_back(MSD);
else
ExternalSymbolData.push_back(MSD);