Skip to content

Commit cb7d68a

Browse files
MaskRayMaskRay
committed
MCParser: Replace deprecated alias MCAsmLexer with AsmLexer
1 parent d2eec93 commit cb7d68a

File tree

17 files changed

+31
-31
lines changed

17 files changed

+31
-31
lines changed

‎llvm/include/llvm/MC/MCParser/MCAsmParser.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ class MCAsmParser {
163163
MCContext &getContext() { return Ctx; }
164164
MCStreamer &getStreamer() { return Out; }
165165
SourceMgr &getSourceManager() { return SrcMgr; }
166-
MCAsmLexer &getLexer() { return Lexer; }
167-
const MCAsmLexer &getLexer() const { return Lexer; }
166+
AsmLexer &getLexer() { return Lexer; }
167+
const AsmLexer &getLexer() const { return Lexer; }
168168

169169
MCTargetAsmParser &getTargetParser() const { return *TargetParser; }
170170
void setTargetParser(MCTargetAsmParser &P);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class MCAsmParserExtension {
5353

5454
MCContext &getContext() { return getParser().getContext(); }
5555

56-
MCAsmLexer &getLexer() { return getParser().getLexer(); }
57-
const MCAsmLexer &getLexer() const {
56+
AsmLexer &getLexer() { return getParser().getLexer(); }
57+
const AsmLexer &getLexer() const {
5858
return const_cast<MCAsmParserExtension *>(this)->getLexer();
5959
}
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ class AsmParser : public MCAsmParser {
713713

714714
class HLASMAsmParser final : public AsmParser {
715715
private:
716-
MCAsmLexer &Lexer;
716+
AsmLexer &Lexer;
717717
MCStreamer &Out;
718718

719719
void lexLeadingSpaces() {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ bool ELFAsmParser::parseDirectiveSection(StringRef, SMLoc loc) {
394394
}
395395

396396
bool ELFAsmParser::maybeParseSectionType(StringRef &TypeName) {
397-
MCAsmLexer &L = getLexer();
397+
AsmLexer &L = getLexer();
398398
if (L.isNot(AsmToken::Comma))
399399
return false;
400400
Lex();
@@ -427,7 +427,7 @@ bool ELFAsmParser::parseMergeSize(int64_t &Size) {
427427
}
428428

429429
bool ELFAsmParser::parseGroup(StringRef &GroupName, bool &IsComdat) {
430-
MCAsmLexer &L = getLexer();
430+
AsmLexer &L = getLexer();
431431
if (L.isNot(AsmToken::Comma))
432432
return TokError("expected group name");
433433
Lex();
@@ -452,7 +452,7 @@ bool ELFAsmParser::parseGroup(StringRef &GroupName, bool &IsComdat) {
452452
}
453453

454454
bool ELFAsmParser::parseLinkedToSym(MCSymbolELF *&LinkedToSym) {
455-
MCAsmLexer &L = getLexer();
455+
AsmLexer &L = getLexer();
456456
if (L.isNot(AsmToken::Comma))
457457
return TokError("expected linked-to symbol");
458458
Lex();
@@ -561,7 +561,7 @@ bool ELFAsmParser::parseSectionArguments(bool IsPush, SMLoc loc) {
561561
if (maybeParseSectionType(TypeName))
562562
return true;
563563

564-
MCAsmLexer &L = getLexer();
564+
AsmLexer &L = getLexer();
565565
if (TypeName.empty()) {
566566
if (Mergeable)
567567
return TokError("Mergeable section must specify the type");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ bool MCAsmParserExtension::parseDirectiveCGProfile(StringRef, SMLoc) {
6060
}
6161

6262
bool MCAsmParserExtension::maybeParseUniqueID(int64_t &UniqueID) {
63-
MCAsmLexer &L = getLexer();
63+
AsmLexer &L = getLexer();
6464
if (L.isNot(AsmToken::Comma))
6565
return false;
6666
Lex();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace {
3535

3636
class WasmAsmParser : public MCAsmParserExtension {
3737
MCAsmParser *Parser = nullptr;
38-
MCAsmLexer *Lexer = nullptr;
38+
AsmLexer *Lexer = nullptr;
3939

4040
template<bool (WasmAsmParser::*HandlerMethod)(StringRef, SMLoc)>
4141
void addDirectiveHandler(StringRef Directive) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace {
1717

1818
class XCOFFAsmParser : public MCAsmParserExtension {
1919
MCAsmParser *Parser = nullptr;
20-
MCAsmLexer *Lexer = nullptr;
20+
AsmLexer *Lexer = nullptr;
2121

2222
template <bool (XCOFFAsmParser::*HandlerMethod)(StringRef, SMLoc)>
2323
void addDirectiveHandler(StringRef Directive) {

‎llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5523,7 +5523,7 @@ ParseStatus ARMAsmParser::parseRotImm(OperandVector &Operands) {
55235523

55245524
ParseStatus ARMAsmParser::parseModImm(OperandVector &Operands) {
55255525
MCAsmParser &Parser = getParser();
5526-
MCAsmLexer &Lexer = getLexer();
5526+
AsmLexer &Lexer = getLexer();
55275527
int64_t Imm1, Imm2;
55285528

55295529
SMLoc S = Parser.getTok().getLoc();

‎llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class AVRAsmParser : public MCTargetAsmParser {
100100
}
101101

102102
MCAsmParser &getParser() const { return Parser; }
103-
MCAsmLexer &getLexer() const { return Parser.getLexer(); }
103+
AsmLexer &getLexer() const { return Parser.getLexer(); }
104104
};
105105

106106
/// An parsed AVR assembly operand.

‎llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class HexagonAsmParser : public MCTargetAsmParser {
106106
return Assembler;
107107
}
108108

109-
MCAsmLexer &getLexer() const { return Parser.getLexer(); }
109+
AsmLexer &getLexer() const { return Parser.getLexer(); }
110110

111111
bool equalIsAsmAssignment() override { return false; }
112112
bool isLabel(AsmToken &Token) override;
@@ -607,7 +607,7 @@ bool HexagonAsmParser::matchOneInstruction(MCInst &MCI, SMLoc IDLoc,
607607

608608
void HexagonAsmParser::eatToEndOfPacket() {
609609
assert(InBrackets);
610-
MCAsmLexer &Lexer = getLexer();
610+
AsmLexer &Lexer = getLexer();
611611
while (!Lexer.is(AsmToken::RCurly))
612612
Lexer.Lex();
613613
Lexer.Lex();
@@ -926,7 +926,7 @@ bool HexagonAsmParser::parseOperand(OperandVector &Operands) {
926926
MCRegister Register;
927927
SMLoc Begin;
928928
SMLoc End;
929-
MCAsmLexer &Lexer = getLexer();
929+
AsmLexer &Lexer = getLexer();
930930
if (!parseRegister(Register, Begin, End)) {
931931
if (!ErrorMissingParenthesis)
932932
switch (Register.id()) {
@@ -981,7 +981,7 @@ bool HexagonAsmParser::parseOperand(OperandVector &Operands) {
981981
}
982982

983983
bool HexagonAsmParser::isLabel(AsmToken &Token) {
984-
MCAsmLexer &Lexer = getLexer();
984+
AsmLexer &Lexer = getLexer();
985985
AsmToken const &Second = Lexer.getTok();
986986
AsmToken Third = Lexer.peekTok();
987987
StringRef String = Token.getString();
@@ -1030,7 +1030,7 @@ bool HexagonAsmParser::parseRegister(MCRegister &Reg, SMLoc &StartLoc,
10301030

10311031
ParseStatus HexagonAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
10321032
SMLoc &EndLoc) {
1033-
MCAsmLexer &Lexer = getLexer();
1033+
AsmLexer &Lexer = getLexer();
10341034
StartLoc = getLexer().getLoc();
10351035
SmallVector<AsmToken, 5> Lookahead;
10361036
StringRef RawString(Lexer.getTok().getString().data(), 0);
@@ -1111,7 +1111,7 @@ bool HexagonAsmParser::implicitExpressionLocation(OperandVector &Operands) {
11111111

11121112
bool HexagonAsmParser::parseExpression(MCExpr const *&Expr) {
11131113
SmallVector<AsmToken, 4> Tokens;
1114-
MCAsmLexer &Lexer = getLexer();
1114+
AsmLexer &Lexer = getLexer();
11151115
bool Done = false;
11161116
static char const *Comma = ",";
11171117
do {
@@ -1161,7 +1161,7 @@ bool HexagonAsmParser::parseExpressionOrOperand(OperandVector &Operands) {
11611161
/// Parse an instruction.
11621162
bool HexagonAsmParser::parseInstruction(OperandVector &Operands) {
11631163
MCAsmParser &Parser = getParser();
1164-
MCAsmLexer &Lexer = getLexer();
1164+
AsmLexer &Lexer = getLexer();
11651165
while (true) {
11661166
AsmToken const &Token = Parser.getTok();
11671167
switch (Token.getKind()) {

‎llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class LanaiAsmParser : public MCTargetAsmParser {
9191

9292
private:
9393
MCAsmParser &Parser;
94-
MCAsmLexer &Lexer;
94+
AsmLexer &Lexer;
9595

9696
const MCSubtargetInfo &SubtargetInfo;
9797
};

‎llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class MSP430AsmParser : public MCTargetAsmParser {
6464
bool ParseLiteralValues(unsigned Size, SMLoc L);
6565

6666
MCAsmParser &getParser() const { return Parser; }
67-
MCAsmLexer &getLexer() const { return Parser.getLexer(); }
67+
AsmLexer &getLexer() const { return Parser.getLexer(); }
6868

6969
/// @name Auto-generated Matcher Functions
7070
/// {

‎llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8231,7 +8231,7 @@ bool MipsAsmParser::parseSSectionDirective(StringRef Section, unsigned Type) {
82318231
/// ::= .module noginv
82328232
bool MipsAsmParser::parseDirectiveModule() {
82338233
MCAsmParser &Parser = getParser();
8234-
MCAsmLexer &Lexer = getLexer();
8234+
AsmLexer &Lexer = getLexer();
82358235
SMLoc L = Lexer.getLoc();
82368236

82378237
if (!getTargetStreamer().isModuleDirectiveAllowed()) {
@@ -8472,7 +8472,7 @@ bool MipsAsmParser::parseDirectiveModule() {
84728472
/// ::= =64
84738473
bool MipsAsmParser::parseDirectiveModuleFP() {
84748474
MCAsmParser &Parser = getParser();
8475-
MCAsmLexer &Lexer = getLexer();
8475+
AsmLexer &Lexer = getLexer();
84768476

84778477
if (Lexer.isNot(AsmToken::Equal)) {
84788478
reportParseError("unexpected token, expected equals sign '='");
@@ -8505,7 +8505,7 @@ bool MipsAsmParser::parseDirectiveModuleFP() {
85058505
bool MipsAsmParser::parseFpABIValue(MipsABIFlagsSection::FpABIKind &FpABI,
85068506
StringRef Directive) {
85078507
MCAsmParser &Parser = getParser();
8508-
MCAsmLexer &Lexer = getLexer();
8508+
AsmLexer &Lexer = getLexer();
85098509
bool ModuleLevelOptions = Directive == ".module";
85108510

85118511
if (Lexer.is(AsmToken::Identifier)) {

‎llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ static MCSymbolWasm *getOrCreateFunctionTableSymbol(MCContext &Ctx,
226226

227227
class WebAssemblyAsmParser final : public MCTargetAsmParser {
228228
MCAsmParser &Parser;
229-
MCAsmLexer &Lexer;
229+
AsmLexer &Lexer;
230230

231231
// Order of labels, directives and instructions in a .s file have no
232232
// syntactical enforcement. This class is a callback from the actual parser,

‎llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ bool X86AsmParser::MatchRegisterByName(MCRegister &RegNo, StringRef RegName,
14971497
bool X86AsmParser::ParseRegister(MCRegister &RegNo, SMLoc &StartLoc,
14981498
SMLoc &EndLoc, bool RestoreOnFailure) {
14991499
MCAsmParser &Parser = getParser();
1500-
MCAsmLexer &Lexer = getLexer();
1500+
AsmLexer &Lexer = getLexer();
15011501
RegNo = MCRegister();
15021502

15031503
SmallVector<AsmToken, 5> Tokens;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Expected<const CodeRegions &> AsmCodeRegionGenerator::parseCodeRegions(
4747
// comments.
4848
std::unique_ptr<MCAsmParser> Parser(
4949
createMCAsmParser(Regions.getSourceMgr(), Ctx, *Str, MAI));
50-
MCAsmLexer &Lexer = Parser->getLexer();
50+
AsmLexer &Lexer = Parser->getLexer();
5151
MCACommentConsumer *CCP = getCommentConsumer();
5252
Lexer.setCommentConsumer(CCP);
5353
// Enable support for MASM literal numbers (example: 05h, 101b).

‎llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class SystemZAsmLexerTest : public ::testing::Test {
100100
void lexAndCheckTokens(StringRef AsmStr,
101101
SmallVector<AsmToken::TokenKind> ExpectedTokens) {
102102
// Get reference to AsmLexer.
103-
MCAsmLexer &Lexer = Parser->getLexer();
103+
AsmLexer &Lexer = Parser->getLexer();
104104
// Loop through all expected tokens checking one by one.
105105
for (size_t I = 0; I < ExpectedTokens.size(); ++I) {
106106
EXPECT_EQ(Lexer.getTok().getKind(), ExpectedTokens[I]);
@@ -111,7 +111,7 @@ class SystemZAsmLexerTest : public ::testing::Test {
111111
void lexAndCheckIntegerTokensAndValues(StringRef AsmStr,
112112
SmallVector<int64_t> ExpectedValues) {
113113
// Get reference to AsmLexer.
114-
MCAsmLexer &Lexer = Parser->getLexer();
114+
AsmLexer &Lexer = Parser->getLexer();
115115
// Loop through all expected tokens and expected values.
116116
for (size_t I = 0; I < ExpectedValues.size(); ++I) {
117117
// Skip any EndOfStatement tokens, we're not concerned with them.

0 commit comments

Comments
 (0)