From cb7d68a77bfcc644258a4756713fa72732a4909e Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sun, 25 May 2025 12:08:39 -0700 Subject: [PATCH] MCParser: Replace deprecated alias MCAsmLexer with AsmLexer --- llvm/include/llvm/MC/MCParser/MCAsmParser.h | 4 ++-- .../llvm/MC/MCParser/MCAsmParserExtension.h | 4 ++-- llvm/lib/MC/MCParser/AsmParser.cpp | 2 +- llvm/lib/MC/MCParser/ELFAsmParser.cpp | 8 ++++---- llvm/lib/MC/MCParser/MCAsmParserExtension.cpp | 2 +- llvm/lib/MC/MCParser/WasmAsmParser.cpp | 2 +- llvm/lib/MC/MCParser/XCOFFAsmParser.cpp | 2 +- llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp | 2 +- llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp | 2 +- .../Target/Hexagon/AsmParser/HexagonAsmParser.cpp | 14 +++++++------- llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp | 2 +- .../Target/MSP430/AsmParser/MSP430AsmParser.cpp | 2 +- llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp | 6 +++--- .../WebAssembly/AsmParser/WebAssemblyAsmParser.cpp | 2 +- llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp | 2 +- llvm/tools/llvm-mca/CodeRegionGenerator.cpp | 2 +- llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp | 4 ++-- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/llvm/include/llvm/MC/MCParser/MCAsmParser.h b/llvm/include/llvm/MC/MCParser/MCAsmParser.h index 990bd59b7692..e567a9ffbc0c 100644 --- a/llvm/include/llvm/MC/MCParser/MCAsmParser.h +++ b/llvm/include/llvm/MC/MCParser/MCAsmParser.h @@ -163,8 +163,8 @@ public: MCContext &getContext() { return Ctx; } MCStreamer &getStreamer() { return Out; } SourceMgr &getSourceManager() { return SrcMgr; } - MCAsmLexer &getLexer() { return Lexer; } - const MCAsmLexer &getLexer() const { return Lexer; } + AsmLexer &getLexer() { return Lexer; } + const AsmLexer &getLexer() const { return Lexer; } MCTargetAsmParser &getTargetParser() const { return *TargetParser; } void setTargetParser(MCTargetAsmParser &P); diff --git a/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h b/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h index b409a857e009..5081b7cbcf11 100644 --- a/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h +++ b/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h @@ -53,8 +53,8 @@ public: MCContext &getContext() { return getParser().getContext(); } - MCAsmLexer &getLexer() { return getParser().getLexer(); } - const MCAsmLexer &getLexer() const { + AsmLexer &getLexer() { return getParser().getLexer(); } + const AsmLexer &getLexer() const { return const_cast(this)->getLexer(); } diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 31ea57deaf1b..f06bfd35763c 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -713,7 +713,7 @@ private: class HLASMAsmParser final : public AsmParser { private: - MCAsmLexer &Lexer; + AsmLexer &Lexer; MCStreamer &Out; void lexLeadingSpaces() { diff --git a/llvm/lib/MC/MCParser/ELFAsmParser.cpp b/llvm/lib/MC/MCParser/ELFAsmParser.cpp index 5de9999657fb..ec8b40261a6c 100644 --- a/llvm/lib/MC/MCParser/ELFAsmParser.cpp +++ b/llvm/lib/MC/MCParser/ELFAsmParser.cpp @@ -394,7 +394,7 @@ bool ELFAsmParser::parseDirectiveSection(StringRef, SMLoc loc) { } bool ELFAsmParser::maybeParseSectionType(StringRef &TypeName) { - MCAsmLexer &L = getLexer(); + AsmLexer &L = getLexer(); if (L.isNot(AsmToken::Comma)) return false; Lex(); @@ -427,7 +427,7 @@ bool ELFAsmParser::parseMergeSize(int64_t &Size) { } bool ELFAsmParser::parseGroup(StringRef &GroupName, bool &IsComdat) { - MCAsmLexer &L = getLexer(); + AsmLexer &L = getLexer(); if (L.isNot(AsmToken::Comma)) return TokError("expected group name"); Lex(); @@ -452,7 +452,7 @@ bool ELFAsmParser::parseGroup(StringRef &GroupName, bool &IsComdat) { } bool ELFAsmParser::parseLinkedToSym(MCSymbolELF *&LinkedToSym) { - MCAsmLexer &L = getLexer(); + AsmLexer &L = getLexer(); if (L.isNot(AsmToken::Comma)) return TokError("expected linked-to symbol"); Lex(); @@ -561,7 +561,7 @@ bool ELFAsmParser::parseSectionArguments(bool IsPush, SMLoc loc) { if (maybeParseSectionType(TypeName)) return true; - MCAsmLexer &L = getLexer(); + AsmLexer &L = getLexer(); if (TypeName.empty()) { if (Mergeable) return TokError("Mergeable section must specify the type"); diff --git a/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp b/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp index 21842de9af75..7fa05088c972 100644 --- a/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp +++ b/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp @@ -60,7 +60,7 @@ bool MCAsmParserExtension::parseDirectiveCGProfile(StringRef, SMLoc) { } bool MCAsmParserExtension::maybeParseUniqueID(int64_t &UniqueID) { - MCAsmLexer &L = getLexer(); + AsmLexer &L = getLexer(); if (L.isNot(AsmToken::Comma)) return false; Lex(); diff --git a/llvm/lib/MC/MCParser/WasmAsmParser.cpp b/llvm/lib/MC/MCParser/WasmAsmParser.cpp index 6c52693faaca..1f824b80bcd4 100644 --- a/llvm/lib/MC/MCParser/WasmAsmParser.cpp +++ b/llvm/lib/MC/MCParser/WasmAsmParser.cpp @@ -35,7 +35,7 @@ namespace { class WasmAsmParser : public MCAsmParserExtension { MCAsmParser *Parser = nullptr; - MCAsmLexer *Lexer = nullptr; + AsmLexer *Lexer = nullptr; template void addDirectiveHandler(StringRef Directive) { diff --git a/llvm/lib/MC/MCParser/XCOFFAsmParser.cpp b/llvm/lib/MC/MCParser/XCOFFAsmParser.cpp index d20a65f6a476..90d6a1d867a6 100644 --- a/llvm/lib/MC/MCParser/XCOFFAsmParser.cpp +++ b/llvm/lib/MC/MCParser/XCOFFAsmParser.cpp @@ -17,7 +17,7 @@ namespace { class XCOFFAsmParser : public MCAsmParserExtension { MCAsmParser *Parser = nullptr; - MCAsmLexer *Lexer = nullptr; + AsmLexer *Lexer = nullptr; template void addDirectiveHandler(StringRef Directive) { diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp index d068575d7b4c..8c7a65a0355a 100644 --- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp +++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp @@ -5523,7 +5523,7 @@ ParseStatus ARMAsmParser::parseRotImm(OperandVector &Operands) { ParseStatus ARMAsmParser::parseModImm(OperandVector &Operands) { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); int64_t Imm1, Imm2; SMLoc S = Parser.getTok().getLoc(); diff --git a/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp b/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp index a06ce2de13db..cab5caffdcba 100644 --- a/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp +++ b/llvm/lib/Target/AVR/AsmParser/AVRAsmParser.cpp @@ -100,7 +100,7 @@ public: } MCAsmParser &getParser() const { return Parser; } - MCAsmLexer &getLexer() const { return Parser.getLexer(); } + AsmLexer &getLexer() const { return Parser.getLexer(); } }; /// An parsed AVR assembly operand. diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp index cc8446af8799..ae0305d570dc 100644 --- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp +++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp @@ -106,7 +106,7 @@ class HexagonAsmParser : public MCTargetAsmParser { return Assembler; } - MCAsmLexer &getLexer() const { return Parser.getLexer(); } + AsmLexer &getLexer() const { return Parser.getLexer(); } bool equalIsAsmAssignment() override { return false; } bool isLabel(AsmToken &Token) override; @@ -607,7 +607,7 @@ bool HexagonAsmParser::matchOneInstruction(MCInst &MCI, SMLoc IDLoc, void HexagonAsmParser::eatToEndOfPacket() { assert(InBrackets); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); while (!Lexer.is(AsmToken::RCurly)) Lexer.Lex(); Lexer.Lex(); @@ -926,7 +926,7 @@ bool HexagonAsmParser::parseOperand(OperandVector &Operands) { MCRegister Register; SMLoc Begin; SMLoc End; - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); if (!parseRegister(Register, Begin, End)) { if (!ErrorMissingParenthesis) switch (Register.id()) { @@ -981,7 +981,7 @@ bool HexagonAsmParser::parseOperand(OperandVector &Operands) { } bool HexagonAsmParser::isLabel(AsmToken &Token) { - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); AsmToken const &Second = Lexer.getTok(); AsmToken Third = Lexer.peekTok(); StringRef String = Token.getString(); @@ -1030,7 +1030,7 @@ bool HexagonAsmParser::parseRegister(MCRegister &Reg, SMLoc &StartLoc, ParseStatus HexagonAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc, SMLoc &EndLoc) { - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); StartLoc = getLexer().getLoc(); SmallVector Lookahead; StringRef RawString(Lexer.getTok().getString().data(), 0); @@ -1111,7 +1111,7 @@ bool HexagonAsmParser::implicitExpressionLocation(OperandVector &Operands) { bool HexagonAsmParser::parseExpression(MCExpr const *&Expr) { SmallVector Tokens; - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); bool Done = false; static char const *Comma = ","; do { @@ -1161,7 +1161,7 @@ bool HexagonAsmParser::parseExpressionOrOperand(OperandVector &Operands) { /// Parse an instruction. bool HexagonAsmParser::parseInstruction(OperandVector &Operands) { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); while (true) { AsmToken const &Token = Parser.getTok(); switch (Token.getKind()) { diff --git a/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp b/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp index d7c70e99ca6a..78b3d163bfbb 100644 --- a/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp +++ b/llvm/lib/Target/Lanai/AsmParser/LanaiAsmParser.cpp @@ -91,7 +91,7 @@ public: private: MCAsmParser &Parser; - MCAsmLexer &Lexer; + AsmLexer &Lexer; const MCSubtargetInfo &SubtargetInfo; }; diff --git a/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp b/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp index b983580a6352..c61b8adf89ab 100644 --- a/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp +++ b/llvm/lib/Target/MSP430/AsmParser/MSP430AsmParser.cpp @@ -64,7 +64,7 @@ class MSP430AsmParser : public MCTargetAsmParser { bool ParseLiteralValues(unsigned Size, SMLoc L); MCAsmParser &getParser() const { return Parser; } - MCAsmLexer &getLexer() const { return Parser.getLexer(); } + AsmLexer &getLexer() const { return Parser.getLexer(); } /// @name Auto-generated Matcher Functions /// { diff --git a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp index f74da803bfe6..9e839d589323 100644 --- a/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp +++ b/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp @@ -8231,7 +8231,7 @@ bool MipsAsmParser::parseSSectionDirective(StringRef Section, unsigned Type) { /// ::= .module noginv bool MipsAsmParser::parseDirectiveModule() { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); SMLoc L = Lexer.getLoc(); if (!getTargetStreamer().isModuleDirectiveAllowed()) { @@ -8472,7 +8472,7 @@ bool MipsAsmParser::parseDirectiveModule() { /// ::= =64 bool MipsAsmParser::parseDirectiveModuleFP() { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); if (Lexer.isNot(AsmToken::Equal)) { reportParseError("unexpected token, expected equals sign '='"); @@ -8505,7 +8505,7 @@ bool MipsAsmParser::parseDirectiveModuleFP() { bool MipsAsmParser::parseFpABIValue(MipsABIFlagsSection::FpABIKind &FpABI, StringRef Directive) { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); bool ModuleLevelOptions = Directive == ".module"; if (Lexer.is(AsmToken::Identifier)) { diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp index 60948af5b475..9649381f07b1 100644 --- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp +++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmParser.cpp @@ -226,7 +226,7 @@ static MCSymbolWasm *getOrCreateFunctionTableSymbol(MCContext &Ctx, class WebAssemblyAsmParser final : public MCTargetAsmParser { MCAsmParser &Parser; - MCAsmLexer &Lexer; + AsmLexer &Lexer; // Order of labels, directives and instructions in a .s file have no // syntactical enforcement. This class is a callback from the actual parser, diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp index c30121806e58..1e0f9a82a73b 100644 --- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp +++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -1497,7 +1497,7 @@ bool X86AsmParser::MatchRegisterByName(MCRegister &RegNo, StringRef RegName, bool X86AsmParser::ParseRegister(MCRegister &RegNo, SMLoc &StartLoc, SMLoc &EndLoc, bool RestoreOnFailure) { MCAsmParser &Parser = getParser(); - MCAsmLexer &Lexer = getLexer(); + AsmLexer &Lexer = getLexer(); RegNo = MCRegister(); SmallVector Tokens; diff --git a/llvm/tools/llvm-mca/CodeRegionGenerator.cpp b/llvm/tools/llvm-mca/CodeRegionGenerator.cpp index d9b8c6edb0ec..f7f929e49ead 100644 --- a/llvm/tools/llvm-mca/CodeRegionGenerator.cpp +++ b/llvm/tools/llvm-mca/CodeRegionGenerator.cpp @@ -47,7 +47,7 @@ Expected AsmCodeRegionGenerator::parseCodeRegions( // comments. std::unique_ptr Parser( createMCAsmParser(Regions.getSourceMgr(), Ctx, *Str, MAI)); - MCAsmLexer &Lexer = Parser->getLexer(); + AsmLexer &Lexer = Parser->getLexer(); MCACommentConsumer *CCP = getCommentConsumer(); Lexer.setCommentConsumer(CCP); // Enable support for MASM literal numbers (example: 05h, 101b). diff --git a/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp b/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp index 3b940eae232b..4635fc92fd41 100644 --- a/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp +++ b/llvm/unittests/MC/SystemZ/SystemZAsmLexerTest.cpp @@ -100,7 +100,7 @@ protected: void lexAndCheckTokens(StringRef AsmStr, SmallVector ExpectedTokens) { // Get reference to AsmLexer. - MCAsmLexer &Lexer = Parser->getLexer(); + AsmLexer &Lexer = Parser->getLexer(); // Loop through all expected tokens checking one by one. for (size_t I = 0; I < ExpectedTokens.size(); ++I) { EXPECT_EQ(Lexer.getTok().getKind(), ExpectedTokens[I]); @@ -111,7 +111,7 @@ protected: void lexAndCheckIntegerTokensAndValues(StringRef AsmStr, SmallVector ExpectedValues) { // Get reference to AsmLexer. - MCAsmLexer &Lexer = Parser->getLexer(); + AsmLexer &Lexer = Parser->getLexer(); // Loop through all expected tokens and expected values. for (size_t I = 0; I < ExpectedValues.size(); ++I) { // Skip any EndOfStatement tokens, we're not concerned with them.