From 41c3f76dcd0daeec60eddfcb56008a31ad6e8738 Mon Sep 17 00:00:00 2001
From: Tom Weaver <Tom.Weaver@Sony.com>
Date: Tue, 12 Nov 2019 15:17:04 +0000
Subject: [DBG][OPT] Attempt to salvage or undef debug info when removing
 trivially deletable instructions in the Reassociate Expression pass.

Reviewed By: aprantl, vsk

Differential revision: https://reviews.llvm.org/D69943
---
 llvm/lib/Transforms/Scalar/Reassociate.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'llvm/lib/Transforms/Scalar/Reassociate.cpp')

diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp
index 84e9b78638a..0ae022f4cf3 100644
--- a/llvm/lib/Transforms/Scalar/Reassociate.cpp
+++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp
@@ -1898,6 +1898,7 @@ void ReassociatePass::RecursivelyEraseDeadInsts(Instruction *I,
   ValueRankMap.erase(I);
   Insts.remove(I);
   RedoInsts.remove(I);
+  llvm::salvageDebugInfoOrMarkUndef(*I);
   I->eraseFromParent();
   for (auto Op : Ops)
     if (Instruction *OpInst = dyn_cast<Instruction>(Op))
@@ -1914,6 +1915,7 @@ void ReassociatePass::EraseInst(Instruction *I) {
   // Erase the dead instruction.
   ValueRankMap.erase(I);
   RedoInsts.remove(I);
+  llvm::salvageDebugInfoOrMarkUndef(*I);
   I->eraseFromParent();
   // Optimize its operands.
   SmallPtrSet<Instruction *, 8> Visited; // Detect self-referential nodes.
-- 
cgit v1.2.3