diff options
| -rw-r--r-- | lib/MC/MCParser/AsmParser.cpp | 10 | ||||
| -rw-r--r-- | test/MC/AsmParser/macros.s | 21 |
2 files changed, 30 insertions, 1 deletions
diff --git a/lib/MC/MCParser/AsmParser.cpp b/lib/MC/MCParser/AsmParser.cpp index f7236627d5..240c10b547 100644 --- a/lib/MC/MCParser/AsmParser.cpp +++ b/lib/MC/MCParser/AsmParser.cpp @@ -1454,6 +1454,14 @@ void AsmParser::DiagHandler(const SMDiagnostic &Diag, void *Context) { NewDiag.print(0, OS); } +// FIXME: This is mostly duplicated from the function in AsmLexer.cpp. The +// difference being that that function accepts '@' as part of identifiers and +// we can't do that. AsmLexer.cpp should probably be changed to handle +// '@' as a special case when needed. +static bool isIdentifierChar(char c) { + return isalnum(c) || c == '_' || c == '$' || c == '.'; +} + bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, const MacroParameters &Parameters, const MacroArguments &A, @@ -1518,7 +1526,7 @@ bool AsmParser::expandMacro(raw_svector_ostream &OS, StringRef Body, Pos += 2; } else { unsigned I = Pos + 1; - while (isalnum(Body[I]) && I + 1 != End) + while (isIdentifierChar(Body[I]) && I + 1 != End) ++I; const char *Begin = Body.data() + Pos +1; diff --git a/test/MC/AsmParser/macros.s b/test/MC/AsmParser/macros.s index 2957592992..dd2cc1f149 100644 --- a/test/MC/AsmParser/macros.s +++ b/test/MC/AsmParser/macros.s @@ -37,3 +37,24 @@ test3 1,2 3 // CHECK: .globl "ab)(,) -- (cd)" test4 a b)(,),(cd) + +.macro test5 _a +.globl "\_a" +.endm + +test5 zed1 +// CHECK: .globl zed1 + +.macro test6 $a +.globl "\$a" +.endm + +test6 zed2 +// CHECK: .globl zed2 + +.macro test7 .a +.globl "\.a" +.endm + +test7 zed3 +// CHECK: .globl zed3 |