diff options
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 72225ef6039..9350e7cb47f 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -91,16 +91,13 @@ struct MacroInstantiation { SMLoc InstantiationLoc; /// The buffer where parsing should resume upon instantiation completion. - int ExitBuffer; + unsigned ExitBuffer; /// The location where parsing should resume upon instantiation completion. SMLoc ExitLoc; /// The depth of TheCondStack at the start of the instantiation. size_t CondStackDepth; - -public: - MacroInstantiation(SMLoc IL, int EB, SMLoc EL, size_t CondStackDepth); }; struct ParseStatementInfo { @@ -2520,11 +2517,6 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, return false; } -MacroInstantiation::MacroInstantiation(SMLoc IL, int EB, SMLoc EL, - size_t CondStackDepth) - : InstantiationLoc(IL), ExitBuffer(EB), ExitLoc(EL), - CondStackDepth(CondStackDepth) {} - static bool isOperator(AsmToken::TokenKind kind) { switch (kind) { default: @@ -2799,8 +2791,8 @@ bool AsmParser::handleMacroEntry(const MCAsmMacro *M, SMLoc NameLoc) { // Create the macro instantiation object and add to the current macro // instantiation stack. - MacroInstantiation *MI = new MacroInstantiation( - NameLoc, CurBuffer, getTok().getLoc(), TheCondStack.size()); + MacroInstantiation *MI = new MacroInstantiation{ + NameLoc, CurBuffer, getTok().getLoc(), TheCondStack.size()}; ActiveMacros.push_back(MI); ++NumOfMacroInstantiations; @@ -5544,8 +5536,8 @@ void AsmParser::instantiateMacroLikeBody(MCAsmMacro *M, SMLoc DirectiveLoc, // Create the macro instantiation object and add to the current macro // instantiation stack. - MacroInstantiation *MI = new MacroInstantiation( - DirectiveLoc, CurBuffer, getTok().getLoc(), TheCondStack.size()); + MacroInstantiation *MI = new MacroInstantiation{ + DirectiveLoc, CurBuffer, getTok().getLoc(), TheCondStack.size()}; ActiveMacros.push_back(MI); // Jump to the macro instantiation and prime the lexer. |
