Skip to content

Commit 4f3d68a

Browse files
authored
[NFC][MC] Namespace cleanup in MC (#168627)
- Add declarations of various `MCAsmParserExtension` creation functions to MCAsmParserExtension.h and use namespace qualifiers to define these and some other functions. - Add end of namespace comments. - Fix indentation of `MCNullStreamer` class. - Remove namespace surrounding code in MCWinEH.cpp and use "using namespace" instead.
1 parent 4703195 commit 4f3d68a

16 files changed

+68
-107
lines changed

llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,14 @@ class LLVM_ABI MCAsmParserExtension {
120120
/// @}
121121
};
122122

123+
MCAsmParserExtension *createDarwinAsmParser();
124+
MCAsmParserExtension *createELFAsmParser();
125+
MCAsmParserExtension *createCOFFAsmParser();
126+
MCAsmParserExtension *createCOFFMasmParser();
127+
MCAsmParserExtension *createGOFFAsmParser();
128+
MCAsmParserExtension *createXCOFFAsmParser();
129+
MCAsmParserExtension *createWasmAsmParser();
130+
123131
} // end namespace llvm
124132

125133
#endif // LLVM_MC_MCPARSER_MCASMPARSEREXTENSION_H

llvm/include/llvm/MC/MCWin64EH.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class ARM64UnwindEmitter : public WinEH::UnwindEmitter {
7070
void EmitUnwindInfo(MCStreamer &Streamer, WinEH::FrameInfo *FI,
7171
bool HandlerData) const override;
7272
};
73-
}
74-
} // end namespace llvm
73+
} // namespace Win64EH
74+
} // namespace llvm
7575

7676
#endif

llvm/include/llvm/MC/MCWinEH.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class LLVM_ABI UnwindEmitter {
113113
virtual void EmitUnwindInfo(MCStreamer &Streamer, FrameInfo *FI,
114114
bool HandlerData) const = 0;
115115
};
116-
}
117-
}
116+
} // namespace WinEH
117+
} // namespace llvm
118118

119119
#endif

llvm/lib/MC/MCDisassembler/MCExternalSymbolizer.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,13 @@ void MCExternalSymbolizer::tryAddingPcLoadReferenceComment(raw_ostream &cStream,
183183
}
184184
}
185185

186-
namespace llvm {
187-
MCSymbolizer *createMCSymbolizer(const Triple &TT, LLVMOpInfoCallback GetOpInfo,
188-
LLVMSymbolLookupCallback SymbolLookUp,
189-
void *DisInfo, MCContext *Ctx,
190-
std::unique_ptr<MCRelocationInfo> &&RelInfo) {
186+
MCSymbolizer *
187+
llvm::createMCSymbolizer(const Triple &TT, LLVMOpInfoCallback GetOpInfo,
188+
LLVMSymbolLookupCallback SymbolLookUp, void *DisInfo,
189+
MCContext *Ctx,
190+
std::unique_ptr<MCRelocationInfo> &&RelInfo) {
191191
assert(Ctx && "No MCContext given for symbolic disassembly");
192192

193193
return new MCExternalSymbolizer(*Ctx, std::move(RelInfo), GetOpInfo,
194194
SymbolLookUp, DisInfo);
195195
}
196-
}

llvm/lib/MC/MCNullStreamer.cpp

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,34 +20,33 @@ using namespace llvm;
2020

2121
namespace {
2222

23-
class MCNullStreamer : public MCStreamer {
24-
public:
25-
MCNullStreamer(MCContext &Context) : MCStreamer(Context) {}
26-
27-
/// @name MCStreamer Interface
28-
/// @{
29-
30-
bool hasRawTextSupport() const override { return true; }
31-
void emitRawTextImpl(StringRef String) override {}
32-
33-
bool emitSymbolAttribute(MCSymbol *Symbol,
34-
MCSymbolAttr Attribute) override {
35-
return true;
36-
}
37-
38-
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
39-
Align ByteAlignment) override {}
40-
void emitSubsectionsViaSymbols() override {};
41-
void beginCOFFSymbolDef(const MCSymbol *Symbol) override {}
42-
void emitCOFFSymbolStorageClass(int StorageClass) override {}
43-
void emitCOFFSymbolType(int Type) override {}
44-
void endCOFFSymbolDef() override {}
45-
void
46-
emitXCOFFSymbolLinkageWithVisibility(MCSymbol *Symbol, MCSymbolAttr Linkage,
47-
MCSymbolAttr Visibility) override {}
48-
};
49-
50-
}
23+
class MCNullStreamer : public MCStreamer {
24+
public:
25+
MCNullStreamer(MCContext &Context) : MCStreamer(Context) {}
26+
27+
/// @name MCStreamer Interface
28+
/// @{
29+
30+
bool hasRawTextSupport() const override { return true; }
31+
void emitRawTextImpl(StringRef String) override {}
32+
33+
bool emitSymbolAttribute(MCSymbol *Symbol, MCSymbolAttr Attribute) override {
34+
return true;
35+
}
36+
37+
void emitCommonSymbol(MCSymbol *Symbol, uint64_t Size,
38+
Align ByteAlignment) override {}
39+
void emitSubsectionsViaSymbols() override {};
40+
void beginCOFFSymbolDef(const MCSymbol *Symbol) override {}
41+
void emitCOFFSymbolStorageClass(int StorageClass) override {}
42+
void emitCOFFSymbolType(int Type) override {}
43+
void endCOFFSymbolDef() override {}
44+
void emitXCOFFSymbolLinkageWithVisibility(MCSymbol *Symbol,
45+
MCSymbolAttr Linkage,
46+
MCSymbolAttr Visibility) override {}
47+
};
48+
49+
} // namespace
5150

5251
MCStreamer *llvm::createNullStreamer(MCContext &Context) {
5352
return new MCNullStreamer(Context);

llvm/lib/MC/MCParser/AsmParser.cpp

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -739,13 +739,6 @@ namespace llvm {
739739

740740
extern cl::opt<unsigned> AsmMacroMaxNestingDepth;
741741

742-
extern MCAsmParserExtension *createDarwinAsmParser();
743-
extern MCAsmParserExtension *createELFAsmParser();
744-
extern MCAsmParserExtension *createCOFFAsmParser();
745-
extern MCAsmParserExtension *createGOFFAsmParser();
746-
extern MCAsmParserExtension *createXCOFFAsmParser();
747-
extern MCAsmParserExtension *createWasmAsmParser();
748-
749742
} // end namespace llvm
750743

751744
AsmParser::AsmParser(SourceMgr &SM, MCContext &Ctx, MCStreamer &Out,
@@ -6270,12 +6263,11 @@ bool HLASMAsmParser::parseStatement(ParseStatementInfo &Info,
62706263
return parseAsMachineInstruction(Info, SI);
62716264
}
62726265

6273-
namespace llvm {
6274-
namespace MCParserUtils {
6275-
6276-
bool parseAssignmentExpression(StringRef Name, bool allow_redef,
6277-
MCAsmParser &Parser, MCSymbol *&Sym,
6278-
const MCExpr *&Value) {
6266+
bool llvm::MCParserUtils::parseAssignmentExpression(StringRef Name,
6267+
bool allow_redef,
6268+
MCAsmParser &Parser,
6269+
MCSymbol *&Sym,
6270+
const MCExpr *&Value) {
62796271

62806272
// FIXME: Use better location, we should use proper tokens.
62816273
SMLoc EqualLoc = Parser.getTok().getLoc();
@@ -6312,9 +6304,6 @@ bool parseAssignmentExpression(StringRef Name, bool allow_redef,
63126304
return false;
63136305
}
63146306

6315-
} // end namespace MCParserUtils
6316-
} // end namespace llvm
6317-
63186307
/// Create an MCAsmParser instance.
63196308
MCAsmParser *llvm::createMCAsmParser(SourceMgr &SM, MCContext &C,
63206309
MCStreamer &Out, const MCAsmInfo &MAI,

llvm/lib/MC/MCParser/COFFAsmParser.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,4 @@ bool COFFAsmParser::parseAtUnwindOrAtExcept(bool &unwind, bool &except) {
796796
return false;
797797
}
798798

799-
namespace llvm {
800-
801-
MCAsmParserExtension *createCOFFAsmParser() {
802-
return new COFFAsmParser;
803-
}
804-
805-
} // end namespace llvm
799+
MCAsmParserExtension *llvm::createCOFFAsmParser() { return new COFFAsmParser; }

llvm/lib/MC/MCParser/COFFMasmParser.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,6 @@ bool COFFMasmParser::parseSEHDirectiveEndProlog(StringRef Directive,
535535
return false;
536536
}
537537

538-
namespace llvm {
539-
540-
MCAsmParserExtension *createCOFFMasmParser() { return new COFFMasmParser; }
541-
542-
} // end namespace llvm
538+
MCAsmParserExtension *llvm::createCOFFMasmParser() {
539+
return new COFFMasmParser;
540+
}

llvm/lib/MC/MCParser/DarwinAsmParser.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,10 +1192,6 @@ bool DarwinAsmParser::parseDirectiveCGProfile(StringRef S, SMLoc Loc) {
11921192
return MCAsmParserExtension::parseDirectiveCGProfile(S, Loc);
11931193
}
11941194

1195-
namespace llvm {
1196-
1197-
MCAsmParserExtension *createDarwinAsmParser() {
1195+
MCAsmParserExtension *llvm::createDarwinAsmParser() {
11981196
return new DarwinAsmParser;
11991197
}
1200-
1201-
} // end llvm namespace

llvm/lib/MC/MCParser/ELFAsmParser.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,4 @@ bool ELFAsmParser::parseDirectiveCGProfile(StringRef S, SMLoc Loc) {
887887
return MCAsmParserExtension::parseDirectiveCGProfile(S, Loc);
888888
}
889889

890-
namespace llvm {
891-
892-
MCAsmParserExtension *createELFAsmParser() {
893-
return new ELFAsmParser;
894-
}
895-
896-
} // end namespace llvm
890+
MCAsmParserExtension *llvm::createELFAsmParser() { return new ELFAsmParser; }

0 commit comments

Comments
 (0)