Skip to content

Commit b7e7131

Browse files
MaskRayMaskRay
committed
[MC] Add SMLoc to MCStreamer::emitSymbolAttribute and report changed binding warnings/errors for ELF
1 parent ed0e367 commit b7e7131

20 files changed

+47
-38
lines changed

‎llvm/include/llvm/MC/MCELFStreamer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ class MCELFStreamer : public MCObjectStreamer {
4646
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
4747
void emitThumbFunc(MCSymbol *Func) override;
4848
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
49-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
49+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
50+
SMLoc Loc = SMLoc()) override;
5051
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
5152
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
5253
unsigned ByteAlignment) override;

‎llvm/include/llvm/MC/MCStreamer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ class MCStreamer {
508508
virtual void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol);
509509

510510
/// Add the given \p Attribute to \p Symbol.
511-
virtual bool emitSymbolAttribute(MCSymbol *Symbol,
512-
MCSymbolAttr Attribute) = 0;
511+
virtual bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
512+
SMLoc Loc = SMLoc()) = 0;
513513

514514
/// Set the \p DescValue for the \p Symbol.
515515
///

‎llvm/include/llvm/MC/MCWasmStreamer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class MCWasmStreamer : public MCObjectStreamer {
4444
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
4545
void emitThumbFunc(MCSymbol *Func) override;
4646
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
47-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
47+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
48+
SMLoc) override;
4849
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
4950
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
5051
unsigned ByteAlignment) override;

‎llvm/include/llvm/MC/MCWinCOFFStreamer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ class MCWinCOFFStreamer : public MCObjectStreamer {
4343
void emitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override;
4444
void emitAssemblerFlag(MCAssemblerFlag Flag) override;
4545
void emitThumbFunc(MCSymbol *Func) override;
46-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
46+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
47+
SMLoc Loc = SMLoc()) override;
4748
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
4849
void BeginCOFFSymbolDef(MCSymbol const *Symbol) override;
4950
void EmitCOFFSymbolStorageClass(int StorageClass) override;

‎llvm/include/llvm/MC/MCXCOFFStreamer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ class MCXCOFFStreamer : public MCObjectStreamer {
1919
std::unique_ptr<MCObjectWriter> OW,
2020
std::unique_ptr<MCCodeEmitter> Emitter);
2121

22-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
22+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
23+
SMLoc Loc = SMLoc()) override;
2324
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
2425
unsigned ByteAlignment) override;
2526
void emitZerofill(MCSection *Section, MCSymbol *Symbol = nullptr,

‎llvm/lib/MC/MCAsmStreamer.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ class MCAsmStreamer final : public MCStreamer {
157157

158158
void emitAssignment(MCSymbol *Symbol, const MCExpr *Value) override;
159159
void emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) override;
160-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
160+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
161+
SMLoc) override;
161162

162163
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
163164
void BeginCOFFSymbolDef(const MCSymbol *Symbol) override;
@@ -635,7 +636,7 @@ void MCAsmStreamer::emitWeakReference(MCSymbol *Alias, const MCSymbol *Symbol) {
635636
}
636637

637638
bool MCAsmStreamer::emitSymbolAttribute(MCSymbol *Symbol,
638-
MCSymbolAttr Attribute) {
639+
MCSymbolAttr Attribute, SMLoc) {
639640
switch (Attribute) {
640641
case MCSA_Invalid: llvm_unreachable("Invalid symbol attribute");
641642
case MCSA_ELF_TypeFunction: /// .type _foo, STT_FUNC # aka @function

‎llvm/lib/MC/MCELFStreamer.cpp

+8-7
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,8 @@ static unsigned CombineSymbolTypes(unsigned T1, unsigned T2) {
187187
return T2;
188188
}
189189

190-
bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
190+
bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
191+
SMLoc Loc) {
191192
auto *Symbol = cast<MCSymbolELF>(S);
192193

193194
// Adding a symbol attribute always introduces the symbol, note that an
@@ -229,8 +230,8 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
229230
// traditionally set the binding to STB_GLOBAL. This is error-prone, so we
230231
// error on such cases. Note, we also disallow changed binding from .local.
231232
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_GLOBAL)
232-
getContext().reportError(SMLoc(), Symbol->getName() +
233-
" changed binding to STB_GLOBAL");
233+
getContext().reportError(Loc, Symbol->getName() +
234+
" changed binding to STB_GLOBAL");
234235
Symbol->setBinding(ELF::STB_GLOBAL);
235236
Symbol->setExternal(true);
236237
break;
@@ -240,16 +241,16 @@ bool MCELFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
240241
// For `.global x; .weak x`, both MC and GNU as set the binding to STB_WEAK.
241242
// We emit a warning for now but may switch to an error in the future.
242243
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_WEAK)
243-
getContext().reportWarning(SMLoc(), Symbol->getName() +
244-
" changed binding to STB_WEAK");
244+
getContext().reportWarning(Loc, Symbol->getName() +
245+
" changed binding to STB_WEAK");
245246
Symbol->setBinding(ELF::STB_WEAK);
246247
Symbol->setExternal(true);
247248
break;
248249

249250
case MCSA_Local:
250251
if (Symbol->isBindingSet() && Symbol->getBinding() != ELF::STB_LOCAL)
251-
getContext().reportError(SMLoc(), Symbol->getName() +
252-
" changed binding to STB_LOCAL");
252+
getContext().reportError(Loc, Symbol->getName() +
253+
" changed binding to STB_LOCAL");
253254
Symbol->setBinding(ELF::STB_LOCAL);
254255
Symbol->setExternal(false);
255256
break;

‎llvm/lib/MC/MCMachOStreamer.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ class MCMachOStreamer : public MCObjectStreamer {
9393
void emitBuildVersion(unsigned Platform, unsigned Major, unsigned Minor,
9494
unsigned Update, VersionTuple SDKVersion) override;
9595
void emitThumbFunc(MCSymbol *Func) override;
96-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
96+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
97+
SMLoc Loc = SMLoc()) override;
9798
void emitSymbolDesc(MCSymbol *Symbol, unsigned DescValue) override;
9899
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
99100
unsigned ByteAlignment) override;
@@ -290,8 +291,8 @@ void MCMachOStreamer::emitThumbFunc(MCSymbol *Symbol) {
290291
cast<MCSymbolMachO>(Symbol)->setThumbFunc();
291292
}
292293

293-
bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym,
294-
MCSymbolAttr Attribute) {
294+
bool MCMachOStreamer::emitSymbolAttribute(MCSymbol *Sym, MCSymbolAttr Attribute,
295+
SMLoc) {
295296
MCSymbolMachO *Symbol = cast<MCSymbolMachO>(Sym);
296297

297298
// Indirect symbols are handled differently, to match how 'as' handles

‎llvm/lib/MC/MCNullStreamer.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ namespace {
2525
bool hasRawTextSupport() const override { return true; }
2626
void emitRawTextImpl(StringRef String) override {}
2727

28-
bool emitSymbolAttribute(MCSymbol *Symbol,
29-
MCSymbolAttr Attribute) override {
28+
bool emitSymbolAttribute(MCSymbol *, MCSymbolAttr, SMLoc) override {
3029
return true;
3130
}
3231

‎llvm/lib/MC/MCParser/AsmParser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4881,7 +4881,7 @@ bool AsmParser::parseDirectiveSymbolAttribute(MCSymbolAttr Attr) {
48814881
if (Sym->isTemporary())
48824882
return Error(Loc, "non-local symbol required");
48834883

4884-
if (!getStreamer().emitSymbolAttribute(Sym, Attr))
4884+
if (!getStreamer().emitSymbolAttribute(Sym, Attr, Loc))
48854885
return Error(Loc, "unable to emit symbol attribute");
48864886
return false;
48874887
};

‎llvm/lib/MC/MCParser/ELFAsmParser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,13 @@ bool ELFAsmParser::ParseDirectiveSymbolAttribute(StringRef Directive, SMLoc) {
178178
if (getLexer().isNot(AsmToken::EndOfStatement)) {
179179
while (true) {
180180
StringRef Name;
181-
181+
SMLoc Loc = getTok().getLoc();
182182
if (getParser().parseIdentifier(Name))
183183
return TokError("expected identifier in directive");
184184

185185
MCSymbol *Sym = getContext().getOrCreateSymbol(Name);
186186

187-
getStreamer().emitSymbolAttribute(Sym, Attr);
187+
getStreamer().emitSymbolAttribute(Sym, Attr, Loc);
188188

189189
if (getLexer().is(AsmToken::EndOfStatement))
190190
break;

‎llvm/lib/MC/MCWasmStreamer.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ void MCWasmStreamer::emitWeakReference(MCSymbol *Alias,
7777
Alias->setVariableValue(Value);
7878
}
7979

80-
bool MCWasmStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute) {
80+
bool MCWasmStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
81+
SMLoc) {
8182
assert(Attribute != MCSA_IndirectSymbol && "indirect symbols not supported");
8283

8384
auto *Symbol = cast<MCSymbolWasm>(S);

‎llvm/lib/MC/MCWinCOFFStreamer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ void MCWinCOFFStreamer::emitThumbFunc(MCSymbol *Func) {
107107
llvm_unreachable("not implemented");
108108
}
109109

110-
bool MCWinCOFFStreamer::emitSymbolAttribute(MCSymbol *S,
111-
MCSymbolAttr Attribute) {
110+
bool MCWinCOFFStreamer::emitSymbolAttribute(MCSymbol *S, MCSymbolAttr Attribute,
111+
SMLoc) {
112112
auto *Symbol = cast<MCSymbolCOFF>(S);
113113
getAssembler().registerSymbol(*Symbol);
114114

‎llvm/lib/MC/MCXCOFFStreamer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ MCXCOFFStreamer::MCXCOFFStreamer(MCContext &Context,
2929
: MCObjectStreamer(Context, std::move(MAB), std::move(OW),
3030
std::move(Emitter)) {}
3131

32-
bool MCXCOFFStreamer::emitSymbolAttribute(MCSymbol *Sym,
33-
MCSymbolAttr Attribute) {
32+
bool MCXCOFFStreamer::emitSymbolAttribute(MCSymbol *Sym, MCSymbolAttr Attribute,
33+
SMLoc) {
3434
auto *Symbol = cast<MCSymbolXCOFF>(Sym);
3535
getAssembler().registerSymbol(*Symbol);
3636

‎llvm/lib/Object/RecordStreamer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void RecordStreamer::emitAssignment(MCSymbol *Symbol, const MCExpr *Value) {
9797
}
9898

9999
bool RecordStreamer::emitSymbolAttribute(MCSymbol *Symbol,
100-
MCSymbolAttr Attribute) {
100+
MCSymbolAttr Attribute, SMLoc) {
101101
if (Attribute == MCSA_Global || Attribute == MCSA_Weak)
102102
markGlobal(*Symbol, Attribute);
103103
if (Attribute == MCSA_LazyReference)
@@ -226,7 +226,7 @@ void RecordStreamer::flushSymverDirectives() {
226226
// Don't use EmitAssignment override as it always marks alias as defined.
227227
MCStreamer::emitAssignment(Alias, Value);
228228
if (Attr != MCSA_Invalid)
229-
emitSymbolAttribute(Alias, Attr);
229+
emitSymbolAttribute(Alias, Attr, SMLoc());
230230
}
231231
}
232232
}

‎llvm/lib/Object/RecordStreamer.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ class RecordStreamer : public MCStreamer {
4848
void emitInstruction(const MCInst &Inst, const MCSubtargetInfo &STI) override;
4949
void emitLabel(MCSymbol *Symbol, SMLoc Loc = SMLoc()) override;
5050
void emitAssignment(MCSymbol *Symbol, const MCExpr *Value) override;
51-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override;
51+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
52+
SMLoc Loc) override;
5253
void emitZerofill(MCSection *Section, MCSymbol *Symbol, uint64_t Size,
5354
unsigned ByteAlignment, SMLoc Loc = SMLoc()) override;
5455
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,

‎llvm/test/MC/ELF/symbol-binding-changed.s

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# RUN: not llvm-mc -filetype=obj -triple=x86_64 %s -o /dev/null 2>&1 | FileCheck %s --implicit-check-not=error:
22

3-
# CHECK: error: local changed binding to STB_GLOBAL
3+
# CHECK: {{.*}}.s:[[#@LINE+3]]:8: error: local changed binding to STB_GLOBAL
44
local:
55
.local local
66
.globl local
77

88
## `.globl x; .weak x` matches the GNU as behavior. We issue a warning for now.
9-
# CHECK: warning: global changed binding to STB_WEAK
9+
# CHECK: {{.*}}.s:[[#@LINE+3]]:7: warning: global changed binding to STB_WEAK
1010
global:
1111
.global global
1212
.weak global
1313

14-
# CHECK: error: weak changed binding to STB_LOCAL
14+
# CHECK: {{.*}}.s:[[#@LINE+3]]:8: error: weak changed binding to STB_LOCAL
1515
weak:
1616
.weak weak
1717
.local weak

‎llvm/tools/llvm-exegesis/lib/SnippetFile.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ class BenchmarkCodeStreamer : public MCStreamer, public AsmCommentConsumer {
8989
// We only care about instructions, we don't implement this part of the API.
9090
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
9191
unsigned ByteAlignment) override {}
92-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override {
92+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute,
93+
SMLoc) override {
9394
return false;
9495
}
9596
void emitValueToAlignment(unsigned ByteAlignment, int64_t Value,

‎llvm/tools/llvm-mca/CodeRegionGenerator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class MCStreamerWrapper final : public MCStreamer {
5252
Regions.addInstruction(Inst);
5353
}
5454

55-
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override {
55+
bool emitSymbolAttribute(MCSymbol *, MCSymbolAttr, SMLoc) override {
5656
return true;
5757
}
5858

‎llvm/unittests/CodeGen/TestAsmPrinter.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class MockMCStreamer : public MCStreamer {
2828

2929
// These methods are pure virtual in MCStreamer, thus, have to be overridden:
3030

31-
MOCK_METHOD2(emitSymbolAttribute,
32-
bool(MCSymbol *Symbol, MCSymbolAttr Attribute));
31+
MOCK_METHOD3(emitSymbolAttribute,
32+
bool(MCSymbol *Symbol, MCSymbolAttr Attribute, SMLoc Loc));
3333
MOCK_METHOD3(emitCommonSymbol,
3434
void(MCSymbol *Symbol, uint64_t Size, unsigned ByteAlignment));
3535
MOCK_METHOD5(emitZerofill,

0 commit comments

Comments
 (0)