https://github.com/arichardson updated 
https://github.com/llvm/llvm-project/pull/242123

>From 4521b01ba09923f78548ac8989ff3745013f4422 Mon Sep 17 00:00:00 2001
From: Alex Richardson <[email protected]>
Date: Thu, 12 Nov 2026 17:32:03 -0800
Subject: [PATCH 1/2] [nspr] initial commit

---
 .../TableGen/AsmMatcherCoerceFromRegClass.td  | 10 +++++++
 llvm/utils/TableGen/AsmMatcherEmitter.cpp     | 26 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/llvm/test/TableGen/AsmMatcherCoerceFromRegClass.td 
b/llvm/test/TableGen/AsmMatcherCoerceFromRegClass.td
index 2d5e30eece2f59..ddd2a983da4037 100644
--- a/llvm/test/TableGen/AsmMatcherCoerceFromRegClass.td
+++ b/llvm/test/TableGen/AsmMatcherCoerceFromRegClass.td
@@ -1,5 +1,6 @@
 // RUN: llvm-tblgen -gen-asm-matcher -I %p/../../include %s | FileCheck %s
 // RUN: not llvm-tblgen -gen-asm-matcher -I %p/../../include %s 
-DERR_DUPLICATE_NAME 2>&1 | FileCheck %s --check-prefix=ERR-DUPLICATE-NAME
+// RUN: not llvm-tblgen -gen-asm-matcher -I %p/../../include %s -DERR_SHADOWED 
2>&1 | FileCheck %s --check-prefix=ERR-SHADOWED
 
 include "llvm/Target/Target.td"
 
@@ -101,6 +102,15 @@ def BadRC : RegisterClass<"Arch", [i64], 64, (add R0_Y, 
R0)> {
 // ERR-DUPLICATE-NAME: error: RegisterClass 'BadRC' with CoerceFromRegClass 
contains multiple registers named 'r0'
 #endif
 
+/// MatchRegisterName returns R0 rather than R0_Y for "r0", so R0_Y is never
+/// parsed and can't be coerced from.
+#ifdef ERR_SHADOWED
+def BadRC : RegisterClass<"Arch", [i32], 32, (add R0, R1)> {
+  let CoerceFromRegClass = YGPR;
+}
+// ERR-SHADOWED: error: RegisterClass 'BadRC' cannot coerce from 'R0_Y' since 
MatchRegisterName returns 'R0' for 'r0'
+#endif
+
 // CHECK-LABEL: static MCRegister convertToVRM4(MCRegister Reg) {
 // CHECK-NEXT:    assert(Reg.id() >= Arch::V0 && Reg.id() <= Arch::V4 &&
 // CHECK-NEXT:           (Reg.id() - Arch::V0) % 4 == 0 && "unexpected 
register");
diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp 
b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
index 7f0c52d36661cd..ffe891d78df5b5 100644
--- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp
+++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp
@@ -1332,6 +1332,16 @@ void AsmMatcherInfo::buildRegisterClasses(
     return BS;
   };
 
+  // MatchRegisterName returns the first register (in enum order) for each
+  // AsmName, so registers shadowed by an earlier one are never parsed and
+  // can't be coerced from.
+  StringMap<const CodeGenRegister *> FirstRegByAsmName;
+  for (const CodeGenRegister &Reg : Registers) {
+    StringRef AsmName = Reg.TheDef->getValueAsString("AsmName");
+    if (!AsmName.empty())
+      FirstRegByAsmName.try_emplace(AsmName, &Reg);
+  }
+
   // Allow register classes with CoerceFromRegClass to also accept registers
   // with the same name from that class (e.g. x1 parsed as a GPR for a YGPR
   // operand). They get converted to the right register in convertToMCInst.
@@ -1352,10 +1362,18 @@ void AsmMatcherInfo::buildRegisterClasses(
         Def->getValueAsDef("CoerceFromRegClass"));
     // Iterate getMembers() so conversions are ordered by EnumValue.
     for (const CodeGenRegister *From : FromRC->getMembers()) {
-      const Record *To =
-          RegsByAsmName.lookup(From->TheDef->getValueAsString("AsmName"));
-      if (To && To != From->TheDef)
-        RegConversions[Def].push_back({From->TheDef, To});
+      StringRef AsmName = From->TheDef->getValueAsString("AsmName");
+      const Record *To = RegsByAsmName.lookup(AsmName);
+      if (!To || To == From->TheDef)
+        continue;
+      const CodeGenRegister *First = FirstRegByAsmName.lookup(AsmName);
+      if (First != From)
+        PrintFatalError(Def->getLoc(),
+                        "RegisterClass '" + RC.getName() +
+                            "' cannot coerce from '" + From->getName() +
+                            "' since MatchRegisterName returns '" +
+                            First->getName() + "' for '" + AsmName + "'");
+      RegConversions[Def].push_back({From->TheDef, To});
     }
   }
 

>From 4cdbc8f0935ef2ef2b58a6d5e24b6c9ddd7db7fe Mon Sep 17 00:00:00 2001
From: Alex Richardson <[email protected]>
Date: Tue, 17 Nov 2026 16:15:53 -0800
Subject: [PATCH 2/2] [nspr] update

---
 llvm/include/llvm/Target/Target.td | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/llvm/include/llvm/Target/Target.td 
b/llvm/include/llvm/Target/Target.td
index 9e8ce9fc03e7a3..ae7d711d6c624a 100644
--- a/llvm/include/llvm/Target/Target.td
+++ b/llvm/include/llvm/Target/Target.td
@@ -1753,11 +1753,10 @@ class AsmParser {
   bit ShouldEmitMatchRegisterAltNameWithIndex = false;
 
   // Set to true if MatchRegisterName and MatchRegisterAltName functions
-  // should be generated even if there are duplicate register names. The
-  // target is responsible for coercing aliased registers as necessary
-  // (e.g. via CoerceFromRegClass or in validateTargetOperandClass), and there
-  // are no guarantees about which numeric register identifier will be returned
-  // in the case of multiple matches.
+  // should be generated even if there are duplicate register names. For
+  // duplicate names, these functions return the first matching register in
+  // enum order. The target is responsible for coercing aliased registers as
+  // necessary (e.g. via CoerceFromRegClass or in validateTargetOperandClass).
   bit AllowDuplicateRegisterNames = false;
 
   // HasMnemonicFirst - Set to false if target instructions don't always

_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to