[coroutines][DPValue] Update DILocation in DPValue for hoisted dbg.declare

[apolloww]

Follow up #75402 to cover DPValue

[llvmbot]

@llvm/pr-subscribers-llvm-transforms

Author: Wei Wang (apolloww)

Changes

Follow up #75402 to cover DPValue

---

Full diff: https://github.com/llvm/llvm-project/pull/76765.diff

1 Files Affected:

• (modified) llvm/lib/Transforms/Coroutines/CoroFrame.cpp (+8-2)

diff --git a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
index 529f7309a1a273..690f813b477658 100644
--- a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
+++ b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
@@ -2953,6 +2953,8 @@ void coro::salvageDebugInfo(
     std::optional<BasicBlock::iterator> InsertPt;
     if (auto *I = dyn_cast<Instruction>(Storage)) {
       InsertPt = I->getInsertionPointAfterDef();
+      // Update DILocation only in O0 since it is easy to get out of sync in optimizations.
+      // See https://github.com/llvm/llvm-project/pull/75104 for an example.
       if (!OptimizeFrame && I->getDebugLoc())
         DVI.setDebugLoc(I->getDebugLoc());
     } else if (isa<Argument>(Storage))
@@ -2988,9 +2990,13 @@ void coro::salvageDebugInfo(
   // dbg.declare does.
   if (DPV.getType() == DPValue::LocationType::Declare) {
     std::optional<BasicBlock::iterator> InsertPt;
-    if (auto *I = dyn_cast<Instruction>(Storage))
+    if (auto *I = dyn_cast<Instruction>(Storage)) {
       InsertPt = I->getInsertionPointAfterDef();
-    else if (isa<Argument>(Storage))
+      // Update DILocation only in O0 since it is easy to get out of sync in optimizations.
+      // See https://github.com/llvm/llvm-project/pull/75104 for an example.
+      if (!OptimizeFrame && I->getDebugLoc())
+        DPV.setDebugLoc(I->getDebugLoc());
+    } else if (isa<Argument>(Storage))
       InsertPt = F->getEntryBlock().begin();
     if (InsertPt) {
       DPV.removeFromParent();

[llvmbot]

@llvm/pr-subscribers-coroutines

Author: Wei Wang (apolloww)

Changes

Follow up #75402 to cover DPValue

---

Full diff: https://github.com/llvm/llvm-project/pull/76765.diff

1 Files Affected:

• (modified) llvm/lib/Transforms/Coroutines/CoroFrame.cpp (+8-2)

diff --git a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
index 529f7309a1a273..690f813b477658 100644
--- a/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
+++ b/llvm/lib/Transforms/Coroutines/CoroFrame.cpp
@@ -2953,6 +2953,8 @@ void coro::salvageDebugInfo(
     std::optional<BasicBlock::iterator> InsertPt;
     if (auto *I = dyn_cast<Instruction>(Storage)) {
       InsertPt = I->getInsertionPointAfterDef();
+      // Update DILocation only in O0 since it is easy to get out of sync in optimizations.
+      // See https://github.com/llvm/llvm-project/pull/75104 for an example.
       if (!OptimizeFrame && I->getDebugLoc())
         DVI.setDebugLoc(I->getDebugLoc());
     } else if (isa<Argument>(Storage))
@@ -2988,9 +2990,13 @@ void coro::salvageDebugInfo(
   // dbg.declare does.
   if (DPV.getType() == DPValue::LocationType::Declare) {
     std::optional<BasicBlock::iterator> InsertPt;
-    if (auto *I = dyn_cast<Instruction>(Storage))
+    if (auto *I = dyn_cast<Instruction>(Storage)) {
       InsertPt = I->getInsertionPointAfterDef();
-    else if (isa<Argument>(Storage))
+      // Update DILocation only in O0 since it is easy to get out of sync in optimizations.
+      // See https://github.com/llvm/llvm-project/pull/75104 for an example.
+      if (!OptimizeFrame && I->getDebugLoc())
+        DPV.setDebugLoc(I->getDebugLoc());
+    } else if (isa<Argument>(Storage))
       InsertPt = F->getEntryBlock().begin();
     if (InsertPt) {
       DPV.removeFromParent();

[apolloww]

This addresses the build bot failure when -DLLVM_EXPERIMENTAL_DEBUGINFO_ITERATORS=ON: https://lab.llvm.org/buildbot/#/builders/275/builds/2885

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[OCHyams]

Thanks for updating the DPValue codepath. Looks like this matches the debug-intrinsic methodology, and the original pull request adds a test which includes --try-experimental-debuginfo-iterators, so this is already tested - LGTM.

[dyung]

@apolloww Can you submit your change so that we can get the bot back to green?