RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

[MC] Add SMLoc to MCStreamer::emitSymbolAttribute and report changed binding warnings/errors for ELF

Browse Source
This commit is contained in:
Fangrui Song 2020-10-29 19:41:59 -07:00
parent c4068d104f
commit 2b0a4f95fd
20 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/MC/MCELFStreamer.h
View File

@ -46,7 +46,8 @@ public:
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
void emitThumbFunc(MCSymbol *Func) override;
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc = SMLoc()) override;
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment) override;

4
include/llvm/MC/MCStreamer.h
View File

@ -508,8 +508,8 @@ public:
virtual void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol);
/// Add the given \p Attribute to \p Symbol.
virtual bool emitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) = 0;
virtual bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc = SMLoc()) = 0;
/// Set the \p DescValue for the \p Symbol.
///

3
include/llvm/MC/MCWasmStreamer.h
View File

@ -44,7 +44,8 @@ public:
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
void emitThumbFunc(MCSymbol *Func) override;
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc) override;
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment) override;

3
include/llvm/MC/MCWinCOFFStreamer.h
View File

@ -43,7 +43,8 @@ public:
void emitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override;
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
void emitThumbFunc(MCSymbol *Func) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc = SMLoc()) override;
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
void BeginCOFFSymbolDef(MCSymbol const *Symbol) override;
void EmitCOFFSymbolStorageClass(int StorageClass) override;

3
include/llvm/MC/MCXCOFFStreamer.h
View File

@ -19,7 +19,8 @@ public:
std::unique_ptr<MCObjectWriter> OW,
std::unique_ptr<MCCodeEmitter> Emitter);
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc = SMLoc()) override;
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment) override;
void emitZerofill(MCSection *Section, MCSymbol *Symbol = nullptr,

5
lib/MC/MCAsmStreamer.cpp
View File

@ -157,7 +157,8 @@ public:
void emitAssignment(MCSymbol *Symbol, const MCExpr *Value) override;
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc) override;
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
void BeginCOFFSymbolDef(const MCSymbol *Symbol) override;
@ -635,7 +636,7 @@ void MCAsmStreamer::emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) {
}
bool MCAsmStreamer::emitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) {
MCSymbolAttr Attribute, SMLoc) {
switch (Attribute) {
case MCSA_Invalid: llvm_unreachable("Invalid symbol attribute");
case MCSA_ELF_TypeFunction: /// .type _foo, STT_FUNC # aka @function

15
lib/MC/MCELFStreamer.cpp
View File

@ -187,7 +187,8 @@ static unsigned CombineSymbolTypes(unsigned T1, unsigned T2) {
return T2;
}
bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
SMLoc Loc) {
auto *Symbol = cast<MCSymbolELF>(S);
// Adding a symbol attribute always introduces the symbol, note that an
@ -229,8 +230,8 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
// traditionally set the binding to STB_GLOBAL. This is error-prone, so we
// error on such cases. Note, we also disallow changed binding from .local.
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_GLOBAL)
getContext().reportError(SMLoc(), Symbol->getName() +
" changed binding to STB_GLOBAL");
getContext().reportError(Loc, Symbol->getName() +
" changed binding to STB_GLOBAL");
Symbol->setBinding(ELF::STB_GLOBAL);
Symbol->setExternal(true);
break;
@ -240,16 +241,16 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
// For `.global x; .weak x`, both MC and GNU as set the binding to STB_WEAK.
// We emit a warning for now but may switch to an error in the future.
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_WEAK)
getContext().reportWarning(SMLoc(), Symbol->getName() +
" changed binding to STB_WEAK");
getContext().reportWarning(Loc, Symbol->getName() +
" changed binding to STB_WEAK");
Symbol->setBinding(ELF::STB_WEAK);
Symbol->setExternal(true);
break;
case MCSA_Local:
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_LOCAL)
getContext().reportError(SMLoc(), Symbol->getName() +
" changed binding to STB_LOCAL");
getContext().reportError(Loc, Symbol->getName() +
" changed binding to STB_LOCAL");
Symbol->setBinding(ELF::STB_LOCAL);
Symbol->setExternal(false);
break;

7
lib/MC/MCMachOStreamer.cpp
View File

@ -93,7 +93,8 @@ public:
void emitBuildVersion(unsigned Platform, unsigned Major, unsigned Minor,
unsigned Update, VersionTuple SDKVersion) override;
void emitThumbFunc(MCSymbol *Func) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc = SMLoc()) override;
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment) override;
@ -290,8 +291,8 @@ void MCMachOStreamer::emitThumbFunc(MCSymbol *Symbol) {
cast<MCSymbolMachO>(Symbol)->setThumbFunc();
}
bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym,
MCSymbolAttr Attribute) {
bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym, MCSymbolAttr Attribute,
SMLoc) {
MCSymbolMachO *Symbol = cast<MCSymbolMachO>(Sym);
// Indirect symbols are handled differently, to match how 'as' handles

3
lib/MC/MCNullStreamer.cpp
View File

@ -25,8 +25,7 @@ namespace {
bool hasRawTextSupport() const override { return true; }
void emitRawTextImpl(StringRef String) override {}
bool emitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) override {
bool emitSymbolAttribute(MCSymbol *, MCSymbolAttr, SMLoc) override {
return true;
}

2
lib/MC/MCParser/AsmParser.cpp
View File

@ -4881,7 +4881,7 @@ bool AsmParser::parseDirectiveSymbolAttribute(MCSymbolAttr Attr) {
if (Sym->isTemporary())
return Error(Loc, "non-local symbol required");
if (!getStreamer().emitSymbolAttribute(Sym, Attr))
if (!getStreamer().emitSymbolAttribute(Sym, Attr, Loc))
return Error(Loc, "unable to emit symbol attribute");
return false;
};

4
lib/MC/MCParser/ELFAsmParser.cpp
View File

@ -178,13 +178,13 @@ bool ELFAsmParser::ParseDirectiveSymbolAttribute(StringRef Directive, SMLoc) {
if (getLexer().isNot(AsmToken::EndOfStatement)) {
while (true) {
StringRef Name;
SMLoc Loc = getTok().getLoc();
if (getParser().parseIdentifier(Name))
return TokError("expected identifier in directive");
MCSymbol *Sym = getContext().getOrCreateSymbol(Name);
getStreamer().emitSymbolAttribute(Sym, Attr);
getStreamer().emitSymbolAttribute(Sym, Attr, Loc);
if (getLexer().is(AsmToken::EndOfStatement))
break;

3
lib/MC/MCWasmStreamer.cpp
View File

@ -77,7 +77,8 @@ void MCWasmStreamer::emitWeakReference(MCSymbol *Alias,
Alias->setVariableValue(Value);
}
bool MCWasmStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
bool MCWasmStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
SMLoc) {
assert(Attribute != MCSA_IndirectSymbol && "indirect symbols not supported");
auto *Symbol = cast<MCSymbolWasm>(S);

4
lib/MC/MCWinCOFFStreamer.cpp
View File

@ -107,8 +107,8 @@ void MCWinCOFFStreamer::emitThumbFunc(MCSymbol *Func) {
llvm_unreachable("not implemented");
}
bool MCWinCOFFStreamer::emitSymbolAttribute(MCSymbol *S,
MCSymbolAttr Attribute) {
bool MCWinCOFFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
SMLoc) {
auto *Symbol = cast<MCSymbolCOFF>(S);
getAssembler().registerSymbol(*Symbol);

4
lib/MC/MCXCOFFStreamer.cpp
View File

@ -29,8 +29,8 @@ MCXCOFFStreamer::MCXCOFFStreamer(MCContext &Context,
: MCObjectStreamer(Context, std::move(MAB), std::move(OW),
std::move(Emitter)) {}
bool MCXCOFFStreamer::emitSymbolAttribute(MCSymbol *Sym,
MCSymbolAttr Attribute) {
bool MCXCOFFStreamer::emitSymbolAttribute(MCSymbol *Sym, MCSymbolAttr Attribute,
SMLoc) {
auto *Symbol = cast<MCSymbolXCOFF>(Sym);
getAssembler().registerSymbol(*Symbol);

4
lib/Object/RecordStreamer.cpp
View File

@ -97,7 +97,7 @@ void RecordStreamer::emitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
}
bool RecordStreamer::emitSymbolAttribute(MCSymbol *Symbol,
MCSymbolAttr Attribute) {
MCSymbolAttr Attribute, SMLoc) {
if (Attribute == MCSA_Global || Attribute == MCSA_Weak)
markGlobal(*Symbol, Attribute);
if (Attribute == MCSA_LazyReference)
@ -226,7 +226,7 @@ void RecordStreamer::flushSymverDirectives() {
// Don't use EmitAssignment override as it always marks alias as defined.
MCStreamer::emitAssignment(Alias, Value);
if (Attr != MCSA_Invalid)
emitSymbolAttribute(Alias, Attr);
emitSymbolAttribute(Alias, Attr, SMLoc());
}
}
}

3
lib/Object/RecordStreamer.h
View File

@ -48,7 +48,8 @@ public:
void emitInstruction(const MCInst &Inst, const MCSubtargetInfo &STI) override;
void emitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override;
void emitAssignment(MCSymbol *Symbol, const MCExpr *Value) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc Loc) override;
void emitZerofill(MCSection *Section, MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment, SMLoc Loc = SMLoc()) override;
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,

6
test/MC/ELF/symbol-binding-changed.s
View File

@ -1,17 +1,17 @@
# RUN: not llvm-mc -filetype=obj -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
# CHECK: error: local changed binding to STB_GLOBAL
# CHECK: {{.*}}.s:[[#@LINE+3]]:8: error: local changed binding to STB_GLOBAL
local:
.local local
.globl local
## `.globl x; .weak x` matches the GNU as behavior. We issue a warning for now.
# CHECK: warning: global changed binding to STB_WEAK
# CHECK: {{.*}}.s:[[#@LINE+3]]:7: warning: global changed binding to STB_WEAK
global:
.global global
.weak global
# CHECK: error: weak changed binding to STB_LOCAL
# CHECK: {{.*}}.s:[[#@LINE+3]]:8: error: weak changed binding to STB_LOCAL
weak:
.weak weak
.local weak

3
tools/llvm-exegesis/lib/SnippetFile.cpp
View File

@ -89,7 +89,8 @@ private:
// We only care about instructions, we don't implement this part of the API.
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
unsigned ByteAlignment) override {}
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override {
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
SMLoc) override {
return false;
}
void emitValueToAlignment(unsigned ByteAlignment, int64_t Value,

2
tools/llvm-mca/CodeRegionGenerator.cpp
View File

@ -52,7 +52,7 @@ public:
Regions.addInstruction(Inst);
}
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override {
bool emitSymbolAttribute(MCSymbol *, MCSymbolAttr, SMLoc) override {
return true;
}

4
unittests/CodeGen/TestAsmPrinter.h
View File

@ -28,8 +28,8 @@ public:
// These methods are pure virtual in MCStreamer, thus, have to be overridden:
MOCK_METHOD2(emitSymbolAttribute,
bool(MCSymbol *Symbol, MCSymbolAttr Attribute));
MOCK_METHOD3(emitSymbolAttribute,
bool(MCSymbol *Symbol, MCSymbolAttr Attribute, SMLoc Loc));
MOCK_METHOD3(emitCommonSymbol,
void(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment));
MOCK_METHOD5(emitZerofill,