[llvm] PeepholeOpt: Fix crash on copy from an undef register (PR #216539)

Matt Arsenault via llvm-commits llvm-commits at lists.llvm.org
Sat Aug 15 23:54:34 PDT 2026


https://github.com/arsenm created https://github.com/llvm/llvm-project/pull/216539

Fix ValueTracker looking at the def chain of an undef subregister.
Found by AI while working on something else.

Co-authored-by: Claude (Opus 4.8) <noreply at anthropic.com>

>From d25587a8939d41f9efb67cfa2dc683a92e0be665 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault at amd.com>
Date: Sat, 15 Aug 2026 23:46:51 +0200
Subject: [PATCH] PeepholeOpt: Fix crash on copy from an undef register

Fix ValueTracker looking at the def chain of an undef subregister.
Found by AI while working on something else.

Co-authored-by: Claude (Opus 4.8) <noreply at anthropic.com>
---
 llvm/lib/CodeGen/PeepholeOptimizer.cpp          |  7 +++++--
 .../CodeGen/X86/peephole-valuetracker-undef.mir | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 llvm/test/CodeGen/X86/peephole-valuetracker-undef.mir

diff --git a/llvm/lib/CodeGen/PeepholeOptimizer.cpp b/llvm/lib/CodeGen/PeepholeOptimizer.cpp
index d46ace0bdd748..e7b0150ae3a72 100644
--- a/llvm/lib/CodeGen/PeepholeOptimizer.cpp
+++ b/llvm/lib/CodeGen/PeepholeOptimizer.cpp
@@ -745,8 +745,11 @@ class ValueTracker {
                const TargetInstrInfo *TII = nullptr)
       : DefSubReg(DefSubReg), Reg(Reg), MRI(MRI), TII(TII) {
     if (!Reg.isPhysical()) {
-      Def = MRI.getVRegDef(Reg);
-      DefIdx = MRI.def_begin(Reg).getOperandNo();
+      MachineRegisterInfo::def_iterator DI = MRI.def_begin(Reg);
+      if (DI != MRI.def_end()) {
+        Def = DI->getParent();
+        DefIdx = DI.getOperandNo();
+      }
     }
   }
 
diff --git a/llvm/test/CodeGen/X86/peephole-valuetracker-undef.mir b/llvm/test/CodeGen/X86/peephole-valuetracker-undef.mir
new file mode 100644
index 0000000000000..b65c40ae40ecc
--- /dev/null
+++ b/llvm/test/CodeGen/X86/peephole-valuetracker-undef.mir
@@ -0,0 +1,17 @@
+# RUN: llc -mtriple=x86_64-- -run-pass=peephole-opt -o - %s | FileCheck %s
+# A copy whose source is an undef register with no def must not crash the
+# peephole optimizer while it looks through the copy for a replacement source.
+
+---
+name: undef_subreg_copy
+tracksRegLiveness: true
+body: |
+  bb.0:
+    ; CHECK-LABEL: name: undef_subreg_copy
+    ; CHECK: [[COPY:%[0-9]+]]:gr32 = COPY undef %{{[0-9]+}}.sub_32bit:gr64
+    ; CHECK-NEXT: $eax = COPY [[COPY]]
+    ; CHECK-NEXT: RET64 implicit $eax
+    %1:gr32 = COPY undef %0.sub_32bit:gr64
+    $eax = COPY %1
+    RET64 implicit $eax
+...



More information about the llvm-commits mailing list