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

[via llvm-commits]

Author: Matt Arsenault
Date: 2026-08-16T12:24:14+02:00
New Revision: ad7345a53718eefdda128d42cd6f79897ff34708

URL: https://github.com/llvm/llvm-project/commit/ad7345a53718eefdda128d42cd6f79897ff34708
DIFF: https://github.com/llvm/llvm-project/commit/ad7345a53718eefdda128d42cd6f79897ff34708.diff

LOG: PeepholeOpt: Fix crash on copy from an undef register (#216539)

Added: 
    llvm/test/CodeGen/X86/peephole-valuetracker-undef.mir

Modified: 
    llvm/lib/CodeGen/PeepholeOptimizer.cpp

Removed: 
    


################################################################################
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
+...