[MCParser] Improve parseIntToken error message

Add a default argument, which is more readable than existing call sites
and encourages new call sites to omit the argument.

Omit " in ... directive" since this the error message includes the line.

Author: MaskRay

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

@@ -270,7 +270,7 @@ class MCAsmParser {
 
   bool parseMany(function_ref<bool()> parseOne, bool hasComma = true);
 
-  bool parseIntToken(int64_t &V, const Twine &ErrMsg);
+  bool parseIntToken(int64_t &V, const Twine &ErrMsg = "expected integer");
 
   bool check(bool P, const Twine &Msg);
   bool check(bool P, SMLoc Loc, const Twine &Msg);

llvm/lib/MC/MCParser/AsmParser.cpp

@@ -3616,13 +3616,7 @@ bool AsmParser::parseDirectiveFile(SMLoc DirectiveLoc) {
 /// parseDirectiveLine
 /// ::= .line [number]
 bool AsmParser::parseDirectiveLine() {
-  int64_t LineNumber;
-  if (getLexer().is(AsmToken::Integer)) {
-    if (parseIntToken(LineNumber, "unexpected token in '.line' directive"))
-      return true;
-    (void)LineNumber;
-    // FIXME: Do something with the .line.
-  }
+  parseOptionalToken(AsmToken::Integer);
   return parseEOL();
 }
 
@@ -3636,7 +3630,7 @@ bool AsmParser::parseDirectiveLine() {
 bool AsmParser::parseDirectiveLoc() {
   int64_t FileNumber = 0, LineNumber = 0;
   SMLoc Loc = getTok().getLoc();
-  if (parseIntToken(FileNumber, "unexpected token in '.loc' directive") ||
+  if (parseIntToken(FileNumber) ||
       check(FileNumber < 1 && Ctx.getDwarfVersion() < 5, Loc,
             "file number less than one in '.loc' directive") ||
       check(!getContext().isValidDwarfFileNumber(FileNumber), Loc,
@@ -3753,8 +3747,7 @@ bool AsmParser::parseDirectiveCVFile() {
   std::string Checksum;
   int64_t ChecksumKind = 0;
 
-  if (parseIntToken(FileNumber,
-                    "expected file number in '.cv_file' directive") ||
+  if (parseIntToken(FileNumber, "expected file number") ||
       check(FileNumber < 1, FileNumberLoc, "file number less than one") ||
       check(getTok().isNot(AsmToken::String),
             "unexpected token in '.cv_file' directive") ||
@@ -3787,19 +3780,18 @@ bool AsmParser::parseCVFunctionId(int64_t &FunctionId,
                                   StringRef DirectiveName) {
   SMLoc Loc;
   return parseTokenLoc(Loc) ||
-         parseIntToken(FunctionId, "expected function id in '" + DirectiveName +
-                                       "' directive") ||
+         parseIntToken(FunctionId, "expected function id") ||
          check(FunctionId < 0 || FunctionId >= UINT_MAX, Loc,
                "expected function id within range [0, UINT_MAX)");
 }
 
 bool AsmParser::parseCVFileId(int64_t &FileNumber, StringRef DirectiveName) {
   SMLoc Loc;
   return parseTokenLoc(Loc) ||
-         parseIntToken(FileNumber, "expected integer in '" + DirectiveName +
-                                       "' directive") ||
-         check(FileNumber < 1, Loc, "file number less than one in '" +
-                                        DirectiveName + "' directive") ||
+         parseIntToken(FileNumber, "expected file number") ||
+         check(FileNumber < 1, Loc,
+               "file number less than one in '" + DirectiveName +
+                   "' directive") ||
          check(!getCVContext().isValidFileNumber(FileNumber), Loc,
                "unassigned file number in '" + DirectiveName + "' directive");
 }
@@ -3978,21 +3970,15 @@ bool AsmParser::parseDirectiveCVInlineLinetable() {
   SMLoc Loc = getTok().getLoc();
   if (parseCVFunctionId(PrimaryFunctionId, ".cv_inline_linetable") ||
       parseTokenLoc(Loc) ||
-      parseIntToken(
-          SourceFileId,
-          "expected SourceField in '.cv_inline_linetable' directive") ||
-      check(SourceFileId <= 0, Loc,
-            "File id less than zero in '.cv_inline_linetable' directive") ||
+      parseIntToken(SourceFileId, "expected SourceField") ||
+      check(SourceFileId <= 0, Loc, "File id less than zero") ||
+      parseTokenLoc(Loc) ||
+      parseIntToken(SourceLineNum, "expected SourceLineNum") ||
+      check(SourceLineNum < 0, Loc, "Line number less than zero") ||
+      parseTokenLoc(Loc) ||
+      check(parseIdentifier(FnStartName), Loc, "expected identifier") ||
       parseTokenLoc(Loc) ||
-      parseIntToken(
-          SourceLineNum,
-          "expected SourceLineNum in '.cv_inline_linetable' directive") ||
-      check(SourceLineNum < 0, Loc,
-            "Line number less than zero in '.cv_inline_linetable' directive") ||
-      parseTokenLoc(Loc) || check(parseIdentifier(FnStartName), Loc,
-                                  "expected identifier in directive") ||
-      parseTokenLoc(Loc) || check(parseIdentifier(FnEndName), Loc,
-                                  "expected identifier in directive"))
+      check(parseIdentifier(FnEndName), Loc, "expected identifier"))
     return true;
 
   if (parseEOL())
@@ -4154,7 +4140,7 @@ bool AsmParser::parseDirectiveCVFileChecksums() {
 /// ::= .cv_filechecksumoffset fileno
 bool AsmParser::parseDirectiveCVFileChecksumOffset() {
   int64_t FileNo;
-  if (parseIntToken(FileNo, "expected identifier in directive"))
+  if (parseIntToken(FileNo))
     return true;
   if (parseEOL())
     return true;
@@ -5896,24 +5882,16 @@ bool AsmParser::parseDirectivePseudoProbe() {
   int64_t Type;
   int64_t Attr;
   int64_t Discriminator = 0;
-
-  if (parseIntToken(Guid, "unexpected token in '.pseudoprobe' directive"))
+  if (parseIntToken(Guid))
     return true;
-
-  if (parseIntToken(Index, "unexpected token in '.pseudoprobe' directive"))
+  if (parseIntToken(Index))
     return true;
-
-  if (parseIntToken(Type, "unexpected token in '.pseudoprobe' directive"))
+  if (parseIntToken(Type))
     return true;
-
-  if (parseIntToken(Attr, "unexpected token in '.pseudoprobe' directive"))
+  if (parseIntToken(Attr))
+    return true;
+  if (hasDiscriminator(Attr) && parseIntToken(Discriminator))
     return true;
-
-  if (hasDiscriminator(Attr)) {
-    if (parseIntToken(Discriminator,
-                      "unexpected token in '.pseudoprobe' directive"))
-      return true;
-  }
 
   // Parse inline stack like @ GUID:11:12 @ GUID:1:11 @ GUID:3:21
   MCPseudoProbeInlineStack InlineStack;
@@ -5924,9 +5902,8 @@ bool AsmParser::parseDirectivePseudoProbe() {
 
     int64_t CallerGuid = 0;
     if (getLexer().is(AsmToken::Integer)) {
-      if (parseIntToken(CallerGuid,
-                        "unexpected token in '.pseudoprobe' directive"))
-        return true;
+      CallerGuid = getTok().getIntVal();
+      Lex();
     }
 
     // eat colon
@@ -5935,9 +5912,8 @@ bool AsmParser::parseDirectivePseudoProbe() {
 
     int64_t CallerProbeId = 0;
     if (getLexer().is(AsmToken::Integer)) {
-      if (parseIntToken(CallerProbeId,
-                        "unexpected token in '.pseudoprobe' directive"))
-        return true;
+      CallerProbeId = getTok().getIntVal();
+      Lex();
     }
 
     InlineSite Site(CallerGuid, CallerProbeId);
@@ -5947,7 +5923,7 @@ bool AsmParser::parseDirectivePseudoProbe() {
   // Parse function entry name
   StringRef FnName;
   if (parseIdentifier(FnName))
-    return Error(getLexer().getLoc(), "unexpected token in '.pseudoprobe' directive");
+    return Error(getLexer().getLoc(), "expected identifier");
   MCSymbol *FnSym = getContext().lookupSymbol(FnName);
 
   if (parseEOL())

llvm/lib/MC/MCParser/MCAsmParserExtension.cpp

@@ -44,8 +44,7 @@ bool MCAsmParserExtension::parseDirectiveCGProfile(StringRef, SMLoc) {
   Lex();
 
   int64_t Count;
-  if (getParser().parseIntToken(
-          Count, "expected integer count in '.cg_profile' directive"))
+  if (getParser().parseIntToken(Count))
     return true;
 
   if (getLexer().isNot(AsmToken::EndOfStatement))

llvm/test/MC/AsmParser/directive_loc.s

@@ -1,5 +1,6 @@
 # RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
 # RUN: llvm-mc -triple i386-unknown-unknown %s -filetype=null
+# RUN: not llvm-mc -triple i386 --defsym ERR=1 %s 2>&1 | FileCheck %s --check-prefix=ERR
 
         .file 1 "hello"
 # CHECK: .file 1 "hello"
@@ -13,3 +14,8 @@
         .loc 1 2 0 isa 3
 # CHECK: 1 2 0 isa 3
         .loc 1 0
+
+.ifdef ERR
+# ERR: [[#@LINE+1]]:6: error: expected integer
+.loc a
+.endif

llvm/test/MC/COFF/cv-errors.s

@@ -3,45 +3,45 @@
 .text
 foo:
 .cv_file a
-# CHECK: error: expected file number in '.cv_file' directive
+# CHECK: error: expected file number
 # CHECK-NOT: error:
 .cv_file 0 "t.cpp"
 # CHECK: error: file number less than one
 # CHECK-NOT: error:
 .cv_func_id x
-# CHECK: error: expected function id in '.cv_func_id' directive
+# CHECK: error: expected function id
 # CHECK-NOT: error:
 .cv_func_id -1
-# CHECK: error: expected function id in '.cv_func_id' directive
+# CHECK: error: expected function id
 # CHECK-NOT: error:
 .cv_func_id 0xFFFFFFFFFFFFFFFF
 # CHECK: error: expected function id within range [0, UINT_MAX)
 # CHECK-NOT: error:
 .cv_inline_site_id x
-# CHECK: error: expected function id in '.cv_inline_site_id' directive
+# CHECK: error: expected function id
 # CHECK-NOT: error:
 
 .cv_file 1 "t.cpp"
 .cv_func_id 0
 
 .cv_inline_site_id 0 0 0 0 0 0
-# CHECK: error: expected 'within' identifier in '.cv_inline_site_id' directive
+# CHECK: error: expected 'within' identifier
 # CHECK-NOT: error:
 
 .cv_inline_site_id 0 within a
-# CHECK: error: expected function id in '.cv_inline_site_id' directive
+# CHECK: error: expected function id
 # CHECK-NOT: error:
 
 .cv_inline_site_id 0 within 0 x
-# CHECK: error: expected 'inlined_at' identifier in '.cv_inline_site_id' directive
+# CHECK: error: expected 'inlined_at' identifier
 # CHECK-NOT: error:
 
 .cv_inline_site_id 0 within 0 inlined_at 0 0 0
-# CHECK: error: file number less than one in '.cv_inline_site_id' directive
+# CHECK: error: file number less than one
 # CHECK-NOT: error:
 
 .cv_inline_site_id 0 within 0 inlined_at 10 0 0
-# CHECK: error: unassigned file number in '.cv_inline_site_id' directive
+# CHECK: error: unassigned file number
 # CHECK-NOT: error:
 
 .cv_inline_site_id 0 within 0 inlined_at 1 1 1