[llvm] [llvm-ml] make TEXTEQU directive not to eagerly expand macros in arguments (PR #209526)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Jul 22 05:40:36 PDT 2026
https://github.com/dingxiangfei2009 updated https://github.com/llvm/llvm-project/pull/209526
>From 4ba8b4288747b6f918b22c1c877e165326d67b51 Mon Sep 17 00:00:00 2001
From: Xiangfei Ding <dingxiangfei2009 at protonmail.ch>
Date: Tue, 14 Jul 2026 15:12:24 +0000
Subject: [PATCH] [llvm-ml] Fix TEXTEQU directive to not eagerly expand text
macro arguments
Signed-off-by: Xiangfei Ding <dingxiangfei2009 at protonmail.ch>
---
llvm/lib/MC/MCParser/MasmParser.cpp | 37 ++++++----
llvm/test/tools/llvm-ml/textequ_expansion.asm | 69 +++++++++++++++++++
2 files changed, 91 insertions(+), 15 deletions(-)
create mode 100644 llvm/test/tools/llvm-ml/textequ_expansion.asm
diff --git a/llvm/lib/MC/MCParser/MasmParser.cpp b/llvm/lib/MC/MCParser/MasmParser.cpp
index 0a4ab8a552dad..3872cdd982ff9 100644
--- a/llvm/lib/MC/MCParser/MasmParser.cpp
+++ b/llvm/lib/MC/MCParser/MasmParser.cpp
@@ -624,6 +624,7 @@ class MasmParser : public MCAsmParser {
StringRef parseStringToEndOfStatement() override;
bool parseTextItem(std::string &Data);
+ bool parseTextList(std::string &Result, StringRef IDVal);
unsigned getBinOpPrecedence(AsmToken::TokenKind K,
MCBinaryExpr::Opcode &Kind);
@@ -2197,9 +2198,11 @@ bool MasmParser::parseStatement(ParseStatementInfo &Info,
break;
case DK_ASSIGN:
case DK_EQU:
- case DK_TEXTEQU:
Lex();
return parseDirectiveEquate(nextVal, IDVal, DirKind, IDLoc);
+ case DK_TEXTEQU:
+ Lex(DoNotExpandMacros);
+ return parseDirectiveEquate(nextVal, IDVal, DirKind, IDLoc);
case DK_BYTE:
if (afterNextTok.is(AsmToken::Identifier) &&
afterNextTok.getString().equals_insensitive("ptr")) {
@@ -2930,20 +2933,7 @@ bool MasmParser::parseDirectiveEquate(StringRef IDVal, StringRef Name,
if (DirKind == DK_EQU || DirKind == DK_TEXTEQU) {
// "equ" and "textequ" both allow text expressions.
std::string Value;
- std::string TextItem;
- if (!parseTextItem(TextItem)) {
- Value += TextItem;
-
- // Accept a text-list, not just one text-item.
- auto parseItem = [&]() -> bool {
- if (parseTextItem(TextItem))
- return TokError("expected text item");
- Value += TextItem;
- return false;
- };
- if (parseOptionalToken(AsmToken::Comma) && parseMany(parseItem))
- return addErrorSuffix(" in '" + Twine(IDVal) + "' directive");
-
+ if (!parseTextList(Value, IDVal)) {
if (!Var.IsText || Var.TextValue != Value) {
switch (Var.Redefinable) {
case Variable::NOT_REDEFINABLE:
@@ -3162,6 +3152,23 @@ bool MasmParser::parseTextItem(std::string &Data) {
llvm_unreachable("unhandled token kind");
}
+/// textList ::= textItem | textList , [ ;; ] textItem
+bool MasmParser::parseTextList(std::string &Result, StringRef IDVal) {
+ std::string TextItem;
+ if (parseTextItem(TextItem))
+ return true;
+ Result += TextItem;
+ while (getTok().is(AsmToken::Comma)) {
+ Lex(DoNotExpandMacros);
+ if (getTok().is(AsmToken::EndOfStatement))
+ Lex(DoNotExpandMacros);
+ if (parseTextItem(TextItem))
+ return TokError("expected text item in '" + Twine(IDVal) + "' directive");
+ Result += TextItem;
+ }
+ return false;
+}
+
/// parseDirectiveAscii:
/// ::= ( .ascii | .asciz | .string ) [ "string" ( , "string" )* ]
bool MasmParser::parseDirectiveAscii(StringRef IDVal, bool ZeroTerminated) {
diff --git a/llvm/test/tools/llvm-ml/textequ_expansion.asm b/llvm/test/tools/llvm-ml/textequ_expansion.asm
new file mode 100644
index 0000000000000..267a235c61f7e
--- /dev/null
+++ b/llvm/test/tools/llvm-ml/textequ_expansion.asm
@@ -0,0 +1,69 @@
+; RUN: llvm-ml -filetype=s %s /Fo - | FileCheck %s
+
+.data
+
+; TEXTEQU with text macro argument should expand correctly.
+part1 TEXTEQU <1>
+part2 TEXTEQU <0>
+joined TEXTEQU part1, part2
+t1 BYTE joined
+
+; CHECK-LABEL: t1:
+; CHECK-NEXT: .byte 10
+
+; TEXTEQU text-list with 3 elements.
+a2 TEXTEQU <1>
+b2 TEXTEQU <2>
+c2 TEXTEQU <3>
+triple TEXTEQU a2, b2, c2
+t2 BYTE triple
+
+; CHECK-LABEL: t2:
+; CHECK-NEXT: .byte 123
+
+; TEXTEQU where a later element is a text macro.
+; The text macro should be resolved by parseTextItem, not the lexer.
+inner TEXTEQU <5>
+outer TEXTEQU <2>, inner
+t3 BYTE outer
+
+; CHECK-LABEL: t3:
+; CHECK-NEXT: .byte 25
+
+; TEXTEQU with trailing ;;
+ts4 TEXTEQU <42>;;
+t4 BYTE ts4
+
+; CHECK-LABEL: t4:
+; CHECK-NEXT: .byte 42
+
+; TEXTEQU multi-element with trailing ;;
+a5 TEXTEQU <1>
+b5 TEXTEQU <0>
+ts5 TEXTEQU a5, b5;;
+t5 BYTE ts5
+
+; CHECK-LABEL: t5:
+; CHECK-NEXT: .byte 10
+
+; TEXTEQU text-list spanning multiple lines.
+a6 TEXTEQU <1>
+b6 TEXTEQU <0>
+ts6 TEXTEQU a6,
+ b6
+t6 BYTE ts6
+
+; CHECK-LABEL: t6:
+; CHECK-NEXT: .byte 10
+
+; TEXTEQU text-list with ;; between items.
+a7 TEXTEQU <1>
+b7 TEXTEQU <0>
+ts7 TEXTEQU a7,;;
+ b7
+t7 BYTE ts7
+
+; CHECK-LABEL: t7:
+; CHECK-NEXT: .byte 10
+
+end
More information about the llvm-commits
mailing list