[llvm] 7d3a181 - [MC] Simplify code with parseComma

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2023-02-01T18:41:02-08:00
New Revision: 7d3a181c8c189561b219c9ddb8ee5f95af59d79e

URL: https://github.com/llvm/llvm-project/commit/7d3a181c8c189561b219c9ddb8ee5f95af59d79e
DIFF: https://github.com/llvm/llvm-project/commit/7d3a181c8c189561b219c9ddb8ee5f95af59d79e.diff

LOG: [MC] Simplify code with parseComma

Added: 
    

Modified: 
    llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
    llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
    llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp
    llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
    llvm/test/MC/ARM/directive-eabi_attribute-diagnostics.s
    llvm/test/MC/ARM/thumb_set-diagnostics.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
index 671d263a41a45..b14abcb131a39 100644
--- a/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
+++ b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
@@ -5609,7 +5609,7 @@ bool AMDGPUAsmParser::ParseDirectiveAMDGPULDS() {
     return TokError("expected identifier in directive");
 
   MCSymbol *Symbol = getContext().getOrCreateSymbol(Name);
-  if (parseToken(AsmToken::Comma, "expected ','"))
+  if (getParser().parseComma())
     return true;
 
   unsigned LocalMemorySize = AMDGPU::IsaInfo::getLocalMemorySize(&getSTI());

diff  --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 7d4fc9760d690..b678fc573dc39 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -11422,7 +11422,7 @@ bool ARMAsmParser::parseDirectiveEabiAttr(SMLoc L) {
     Tag = CE->getValue();
   }
 
-  if (Parser.parseToken(AsmToken::Comma, "comma expected"))
+  if (Parser.parseComma())
     return true;
 
   StringRef StringValue = "";
@@ -11456,7 +11456,7 @@ bool ARMAsmParser::parseDirectiveEabiAttr(SMLoc L) {
   }
 
   if (Tag == ARMBuildAttrs::compatibility) {
-    if (Parser.parseToken(AsmToken::Comma, "comma expected"))
+    if (Parser.parseComma())
       return true;
   }
 
@@ -11668,7 +11668,7 @@ bool ARMAsmParser::parseDirectiveSetFP(SMLoc L) {
   int FPReg = tryParseRegister();
 
   if (check(FPReg == -1, FPRegLoc, "frame pointer register expected") ||
-      Parser.parseToken(AsmToken::Comma, "comma expected"))
+      Parser.parseComma())
     return true;
 
   // Parse spreg
@@ -11927,7 +11927,7 @@ bool ARMAsmParser::parseDirectiveUnwindRaw(SMLoc L) {
 
   StackOffset = CE->getValue();
 
-  if (Parser.parseToken(AsmToken::Comma, "expected comma"))
+  if (Parser.parseComma())
     return true;
 
   SmallVector<uint8_t, 16> Opcodes;
@@ -12071,7 +12071,7 @@ bool ARMAsmParser::parseDirectiveThumbSet(SMLoc L) {
   StringRef Name;
   if (check(Parser.parseIdentifier(Name),
             "expected identifier after '.thumb_set'") ||
-      parseToken(AsmToken::Comma, "expected comma after name '" + Name + "'"))
+      Parser.parseComma())
     return true;
 
   MCSymbol *Sym;

diff  --git a/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp b/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp
index 94ef40e658a33..11ed3dda1c91d 100644
--- a/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp
+++ b/llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp
@@ -1660,7 +1660,7 @@ bool CSKYAsmParser::parseDirectiveAttribute() {
     Tag = CE->getValue();
   }
 
-  if (Parser.parseToken(AsmToken::Comma, "comma expected"))
+  if (Parser.parseComma())
     return true;
 
   StringRef StringValue;

diff  --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
index 1ade316082922..4835fdfb7e04a 100644
--- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
+++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
@@ -2231,7 +2231,7 @@ bool RISCVAsmParser::parseDirectiveAttribute() {
     Tag = CE->getValue();
   }
 
-  if (Parser.parseToken(AsmToken::Comma, "comma expected"))
+  if (Parser.parseComma())
     return true;
 
   StringRef StringValue;

diff  --git a/llvm/test/MC/ARM/directive-eabi_attribute-diagnostics.s b/llvm/test/MC/ARM/directive-eabi_attribute-diagnostics.s
index 2b0375e576136..a20c63013538a 100644
--- a/llvm/test/MC/ARM/directive-eabi_attribute-diagnostics.s
+++ b/llvm/test/MC/ARM/directive-eabi_attribute-diagnostics.s
@@ -25,12 +25,12 @@
 @ CHECK:                            ^
 
 	.eabi_attribute 0
-@ CHECK: error: comma expected
+@ CHECK: :[[#@LINE-1]]:19: error: expected comma
 @ CHECK: 	.eabi_attribute 0
 @ CHECK:                         ^
 
         .eabi_attribute Tag_compatibility, 1
-@ CHECK: error: comma expected
+@ CHECK: :[[#@LINE-1]]:45: error: expected comma
 @ CHECK: .eabi_attribute Tag_compatibility, 1
 @ CHECK:                                     ^
 

diff  --git a/llvm/test/MC/ARM/thumb_set-diagnostics.s b/llvm/test/MC/ARM/thumb_set-diagnostics.s
index 4dd35d289d999..dedc9dddc406c 100644
--- a/llvm/test/MC/ARM/thumb_set-diagnostics.s
+++ b/llvm/test/MC/ARM/thumb_set-diagnostics.s
@@ -24,8 +24,7 @@
 @ CHECK:                            ^
 
 	.thumb_set missing_comma
-
-@ CHECK: error: expected comma after name 'missing_comma'
+@ CHECK: :[[#@LINE-1]]:26: error: expected comma
 @ CHECK: 	.thumb_set missing_comma
 @ CHECK:                                ^