[NFC][RemoveDIs] Add LocationType parameter to DPValue ctor

[OCHyams]

IMO we can tidy up the interfaces a bit once all intrinsics are supported, so we have a complete view.

[llvmbot]

@llvm/pr-subscribers-debuginfo

@llvm/pr-subscribers-llvm-ir

Author: Orlando Cazalet-Hyams (OCHyams)

Changes

IMO we can tidy up the interfaces a bit once all intrinsics are supported, so we have a complete view.

---

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

2 Files Affected:

• (modified) llvm/include/llvm/IR/DebugProgramInstruction.h (+1-1)
• (modified) llvm/lib/IR/DebugProgramInstruction.cpp (+2-3)

diff --git a/llvm/include/llvm/IR/DebugProgramInstruction.h b/llvm/include/llvm/IR/DebugProgramInstruction.h
index cd5d37a078015be..7f16151cdfc64ba 100644
--- a/llvm/include/llvm/IR/DebugProgramInstruction.h
+++ b/llvm/include/llvm/IR/DebugProgramInstruction.h
@@ -113,7 +113,7 @@ class DPValue : public ilist_node<DPValue>, private DebugValueUser {
   /// Directly construct a new DPValue representing a dbg.value intrinsic
   /// assigning \p Location to the DV / Expr / DI variable.
   DPValue(Metadata *Location, DILocalVariable *DV, DIExpression *Expr,
-          const DILocation *DI);
+          const DILocation *DI, LocationType Type = LocationType::Value);
 
   /// Iterator for ValueAsMetadata that internally uses direct pointer iteration
   /// over either a ValueAsMetadata* or a ValueAsMetadata**, dereferencing to the
diff --git a/llvm/lib/IR/DebugProgramInstruction.cpp b/llvm/lib/IR/DebugProgramInstruction.cpp
index 6a4ee9d6101076f..df45c6ea3a776fd 100644
--- a/llvm/lib/IR/DebugProgramInstruction.cpp
+++ b/llvm/lib/IR/DebugProgramInstruction.cpp
@@ -35,10 +35,9 @@ DPValue::DPValue(const DPValue &DPV)
       DbgLoc(DPV.getDebugLoc()), Type(DPV.getType()) {}
 
 DPValue::DPValue(Metadata *Location, DILocalVariable *DV, DIExpression *Expr,
-                 const DILocation *DI)
+                 const DILocation *DI, LocationType Type)
     : DebugValueUser(Location), Variable(DV), Expression(Expr), DbgLoc(DI),
-      Type(LocationType::Value) {
-}
+      Type(Type) {}
 
 void DPValue::deleteInstr() { delete this; }
 

[SLTozer]

SGTM, though although it might be a pain to implement, it might be better to have the LocationType argument be explicit - I've also got a patch to add static DPValue *createDP[Assign|Declare|Value]() functions though, so it might be better to leave the default so that we aren't rewriting all the new DPValue callsites twice.

[OCHyams]

I agree with both points; I think the result being we leave this patch as it is. Thanks!