Merge pull request #11272 from rastogishubham/FixCoroDbgDeclare

Convert #dbg_coroframe_entry to #dbg_value if location is not a pointer.

Author: rastogishubham

llvm/lib/Transforms/Coroutines/CoroFrame.cpp

@@ -1185,10 +1185,13 @@ static void insertSpills(const FrameDataInfo &FrameData, coro::Shape &Shape) {
         // processed by coro::salvageDebugInfo() by the Cloner. However, convert
         // it to a dbg.declare to make sure future passes don't have to deal
         // with a dbg.coroframe_entry.
+        auto *VAM = ValueAsMetadata::get(CurrentReload);
+        Type *Ty = VAM->getValue()->getType();
         DbgVariableRecord *NewDVR = new DbgVariableRecord(
             ValueAsMetadata::get(CurrentReload), DDI->getVariable(),
             DDI->getExpression(), DDI->getDebugLoc(),
-            DbgVariableRecord::LocationType::Declare);
+            Ty->isPointerTy() ? DbgVariableRecord::LocationType::Declare
+                              : DbgVariableRecord::LocationType::Value);
         Builder.GetInsertPoint()->getParent()->insertDbgRecordBefore(
             NewDVR, Builder.GetInsertPoint());
         // This dbg.coroframe_entry is for the main function entry point.  It
@@ -2060,8 +2063,16 @@ void coro::salvageDebugInfo(
       // If there is a dbg.coroframe_entry being reinserted, insert it as a
       // dbg.declare instead, so that subsequent passes don't have to deal with
       // a dbg.coroframe_entry.
-      if (DVR.getType() == DbgVariableRecord::LocationType::CoroFrameEntry)
-        DVR.Type = DbgVariableRecord::LocationType::Declare;
+      if (DVR.getType() == DbgVariableRecord::LocationType::CoroFrameEntry) {
+        auto *MD = DVR.getRawLocation();
+        if (auto *VAM = dyn_cast<ValueAsMetadata>(MD)) {
+          Type *Ty = VAM->getValue()->getType();
+          if (Ty->isPointerTy())
+            DVR.Type = DbgVariableRecord::LocationType::Declare;
+          else
+            DVR.Type = DbgVariableRecord::LocationType::Value;
+        }
+      }
       (*InsertPt)->getParent()->insertDbgRecordBefore(&DVR, *InsertPt);
     }
   }