Index: llvm/lib/IR/DebugInfoMetadata.cpp
===================================================================
--- llvm/lib/IR/DebugInfoMetadata.cpp
+++ llvm/lib/IR/DebugInfoMetadata.cpp
@@ -1908,7 +1908,7 @@
       if (NewVM)
         VM = NewVM;
       else
-        VM = ValueAsMetadata::get(UndefValue::get(VM->getValue()->getType()));
+        VM = ValueAsMetadata::get(PoisonValue::get(VM->getValue()->getType()));
     }
   }
   if (Uniq) {
Index: llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
===================================================================
--- llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
+++ llvm/test/Transforms/GlobalOpt/deadglobal-diarglist-use.ll
@@ -9,7 +9,7 @@
 ; CHECK: %struct.S = type { i32 }
 ; CHECK-NOT: @s
 
-; CHECK: call void @llvm.dbg.value(metadata !DIArgList([1 x %struct.S]* undef
+; CHECK: call void @llvm.dbg.value(metadata !DIArgList([1 x %struct.S]* poison
 
 %struct.S = type { i32 }