Change register naming format from %{reg} to register ${regName}

Amirhossein Pashaeehir · Amirhossein Pashaeehir · commit 62f3d022be5e · 2025-06-26T23:48:23.000Z
diff --git a/llvm/lib/DWARFCFIChecker/DWARFCFIAnalysis.cpp b/llvm/lib/DWARFCFIChecker/DWARFCFIAnalysis.cpp
@@ -206,16 +206,18 @@ void DWARFCFIAnalysis::checkRegDiff(
     if (PrevLoc.getLocation() == NextLoc.getLocation()) {
       Context->reportWarning(
           Inst.getLoc(),
-          formatv("unknown change happened to %{0} unwinding rule values",
-                  RegName));
+          formatv(
+              "unknown change happened to register {0} unwinding rule values",
+              RegName));
       //! FIXME: Check if the register is changed or not
       return;
     }
 
     Context->reportWarning(
         Inst.getLoc(),
-        formatv("unknown change happened to %{0} unwinding rule structure",
-                RegName));
+        formatv(
+            "unknown change happened to register {0} unwinding rule structure",
+            RegName));
     return;
   }
 
@@ -228,7 +230,7 @@ void DWARFCFIAnalysis::checkRegDiff(
     if (Writes.count(MaybePrevRefReg.value())) {
       Context->reportError(
           Inst.getLoc(),
-          formatv("changed %{1}, that %{0} unwinding rule "
+          formatv("changed register {1}, that register {0}'s unwinding rule "
                   "uses, but there is no CFI directives about it",
                   RegName, MCRI->getName(*PrevRefLLVMReg)));
       return;
@@ -289,7 +291,7 @@ void DWARFCFIAnalysis::checkCFADiff(
       return;
     Context->reportError(
         Inst.getLoc(),
-        formatv("modified CFA register (%{0}) but not changed CFA rule",
+        formatv("modified CFA register ({0}) but not changed CFA rule",
                 PrevCFARegName));
   }
 
@@ -299,6 +301,6 @@ void DWARFCFIAnalysis::checkCFADiff(
 
   Context->reportError(
       Inst.getLoc(),
-      formatv("did not modify CFA register (%{0}) but changed CFA rule",
+      formatv("did not modify CFA register ({0}) but changed CFA rule",
               PrevCFARegName));
 }
diff --git a/llvm/test/DWARFCFIChecker/X86/multiple-sections.s b/llvm/test/DWARFCFIChecker/X86/multiple-sections.s
@@ -6,15 +6,15 @@
 f:
         .cfi_startproc
         pushq %rax
-        # CHECK: error: modified CFA register (%RSP) but not changed CFA rule
+        # CHECK: error: modified CFA register (RSP) but not changed CFA rule
         pushq %rax
         .cfi_def_cfa %rbp, -24
         pushq %rax
         .cfi_endproc
 
         .cfi_startproc
         pushq %rax
-        # CHECK: error: modified CFA register (%RSP) but not changed CFA rule
+        # CHECK: error: modified CFA register (RSP) but not changed CFA rule
         pushq %rax
         .cfi_def_cfa %rbp, -24
         pushq %rax
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s b/llvm/test/DWARFCFIChecker/X86/single-func-cfa-mistake.s
@@ -9,7 +9,7 @@ f:
         .cfi_undefined %rax
 
         pushq   %rbp
-        # CHECK: warning: unknown change happened to %RBP unwinding rule structure
+        # CHECK: warning: unknown change happened to register RBP unwinding rule structure
         .cfi_def_cfa_offset 17
         .cfi_offset %rbp, -16
 
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s b/llvm/test/DWARFCFIChecker/X86/single-func-missed-cfi-directive.s
@@ -12,7 +12,7 @@ f:
         .cfi_def_cfa_offset 16
         
         movq    %rsp, %rbp
-        # CHECK: error: changed %RBP, that %RBP unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RBP, that register RBP's unwinding rule uses, but there is no CFI directives about it
         .cfi_def_cfa_register %rbp
         
         movl    %edi, -4(%rbp)
@@ -22,7 +22,7 @@ f:
         addl    $10, %eax
         
         popq    %rbp
-        # CHECK: error: changed %RBP, that %RBP unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RBP, that register RBP's unwinding rule uses, but there is no CFI directives about it
         .cfi_def_cfa %rsp, 8
         
         retq
diff --git a/llvm/test/DWARFCFIChecker/X86/single-func.s b/llvm/test/DWARFCFIChecker/X86/single-func.s
@@ -8,7 +8,7 @@ f:
         .cfi_undefined %rax
         
         pushq   %rbp
-        # CHECK: warning: unknown change happened to %RBP unwinding rule structure
+        # CHECK: warning: unknown change happened to register RBP unwinding rule structure
         .cfi_def_cfa_offset 16
         .cfi_offset %rbp, -16
         
diff --git a/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s b/llvm/test/DWARFCFIChecker/X86/spill-two-reg-reversed.s
@@ -11,35 +11,35 @@ _start:
         .cfi_same_value %rsi
 
         pushq   %rbp
-        # CHECK: warning: unknown change happened to %RBP unwinding rule structure
+        # CHECK: warning: unknown change happened to register RBP unwinding rule structure
         .cfi_adjust_cfa_offset 8
         .cfi_offset %rbp, -16
 
         movq    %rsp, %rbp
 
         pushq   %rdi
-        # CHECK: warning: unknown change happened to %RDI unwinding rule structure
+        # CHECK: warning: unknown change happened to register RDI unwinding rule structure
         .cfi_adjust_cfa_offset 8
         .cfi_rel_offset %rdi, 0
 
         pushq   %rsi
-        # CHECK: warning: unknown change happened to %RSI unwinding rule structure
+        # CHECK: warning: unknown change happened to register RSI unwinding rule structure
         .cfi_adjust_cfa_offset 8
         .cfi_rel_offset %rsi, 0
         
         popq    %rsi
-        # CHECK: warning: unknown change happened to %RDI unwinding rule structure
+        # CHECK: warning: unknown change happened to register RDI unwinding rule structure
         .cfi_adjust_cfa_offset -8
         .cfi_same_value %rdi
 
         popq    %rdi
-        # CHECK: error: changed %RDI, that %RDI unwinding rule uses, but there is no CFI directives about it
-        # CHECK: warning: unknown change happened to %RSI unwinding rule structure
+        # CHECK: error: changed register RDI, that register RDI's unwinding rule uses, but there is no CFI directives about it
+        # CHECK: warning: unknown change happened to register RSI unwinding rule structure
         .cfi_adjust_cfa_offset -8
         .cfi_same_value %rsi
 
         popq    %rbp
-        # CHECK: warning: unknown change happened to %RBP unwinding rule structure
+        # CHECK: warning: unknown change happened to register RBP unwinding rule structure
         .cfi_adjust_cfa_offset -8
         .cfi_same_value %rbp
 
diff --git a/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s b/llvm/test/DWARFCFIChecker/X86/update-with-no-cfi.s
@@ -12,16 +12,16 @@ f:
         .cfi_same_value %rdx
 
         movq $10, %rax
-        # CHECK: error: changed %RAX, that %RAX unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RAX, that register RAX's unwinding rule uses, but there is no CFI directives about it
 
         movq $10, %rbx
-        # CHECK: error: changed %RBX, that %RBX unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RBX, that register RBX's unwinding rule uses, but there is no CFI directives about it
 
         movq $10, %rcx
-        # CHECK: error: changed %RCX, that %RCX unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RCX, that register RCX's unwinding rule uses, but there is no CFI directives about it
 
         movq $10, %rdx
-        # CHECK: error: changed %RDX, that %RDX unwinding rule uses, but there is no CFI directives about it
+        # CHECK: error: changed register RDX, that register RDX's unwinding rule uses, but there is no CFI directives about it
 
         retq
 
