[llvm] c6b3fd7 - [MC] maybeParseSectionType: test CommentString instead of AllowAtInIdentifier

[Fangrui Song via llvm-commits]

Author: Fangrui Song
Date: 2025-03-30T22:27:47-07:00
New Revision: c6b3fd799962577488a0ecbdac806f4753e14d3c

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

LOG: [MC] maybeParseSectionType: test CommentString instead of AllowAtInIdentifier

Rework https://reviews.llvm.org/D31026
AllowAtInIdentifier is a misnomer: it should be false for ELF targets,
but is currently true as a hack to parse expr at specifier.

Added: 
    

Modified: 
    llvm/lib/MC/MCParser/ELFAsmParser.cpp
    llvm/test/MC/ELF/gnu-type-diagnostics.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/MC/MCParser/ELFAsmParser.cpp b/llvm/lib/MC/MCParser/ELFAsmParser.cpp
index 11e122bcaac23..c94ddfa087fd3 100644
--- a/llvm/lib/MC/MCParser/ELFAsmParser.cpp
+++ b/llvm/lib/MC/MCParser/ELFAsmParser.cpp
@@ -401,10 +401,10 @@ bool ELFAsmParser::maybeParseSectionType(StringRef &TypeName) {
   Lex();
   if (L.isNot(AsmToken::At) && L.isNot(AsmToken::Percent) &&
       L.isNot(AsmToken::String)) {
-    if (L.getAllowAtInIdentifier())
-      return TokError("expected '@<type>', '%<type>' or \"<type>\"");
-    else
+    if (getContext().getAsmInfo()->getCommentString().starts_with('@'))
       return TokError("expected '%<type>' or \"<type>\"");
+    else
+      return TokError("expected '@<type>', '%<type>' or \"<type>\"");
   }
   if (!L.is(AsmToken::String))
     Lex();

diff  --git a/llvm/test/MC/ELF/gnu-type-diagnostics.s b/llvm/test/MC/ELF/gnu-type-diagnostics.s
index 23c144fee1db8..dbbfc5a173dec 100644
--- a/llvm/test/MC/ELF/gnu-type-diagnostics.s
+++ b/llvm/test/MC/ELF/gnu-type-diagnostics.s
@@ -15,4 +15,5 @@
 // CHECK: .type symbol 32
 // CHECK:              ^
 
-
+.section "foo", "a", !progbits
+// CHECK: [[#@LINE-1]]:22: error: expected '@<type>', '%<type>' or "<type>"