[SYCL] Cherry-pick 295b14eaea8ea4cd37a09dd5dc50eb6ac3d8a4d9

   This is to fix the build after
    llvm/llvm-project@ecd2aae
    "[DebugInfo] Merge DebugInfoFinder::{processDeclare,processValue} into
    processVariable"

Signed-off-by: Alexey Sotkin <[email protected]>
Signed-off-by: Vladimir Lazarev <[email protected]>

Author: vladimirlaz

llvm-spirv/lib/SPIRV/LLVMToSPIRVDbgTran.cpp

@@ -70,28 +70,28 @@ void LLVMToSPIRVDbgTran::transDebugMetadata() {
   for (const DISubprogram *F : DIF.subprograms())
     transDbgEntry(F);
 
-  for (const DbgDeclareInst *DDI : DbgDeclareIntrinsics)
+  for (const DbgVariableIntrinsic *DDI : DbgDeclareIntrinsics)
     finalizeDebugDeclare(DDI);
 
-  for (const DbgValueInst *DVI : DbgValueIntrinsics)
+  for (const DbgVariableIntrinsic *DVI : DbgValueIntrinsics)
     finalizeDebugValue(DVI);
 
   transLocationInfo();
 }
 
 // llvm.dbg.declare intrinsic.
 
-SPIRVValue *
-LLVMToSPIRVDbgTran::createDebugDeclarePlaceholder(const DbgDeclareInst *DbgDecl,
-                                                  SPIRVBasicBlock *BB) {
+SPIRVValue *LLVMToSPIRVDbgTran::createDebugDeclarePlaceholder(
+    const DbgVariableIntrinsic *DbgDecl, SPIRVBasicBlock *BB) {
   DbgDeclareIntrinsics.push_back(DbgDecl);
   using namespace SPIRVDebug::Operand::DebugDeclare;
   SPIRVWordVec Ops(OperandCount, getDebugInfoNoneId());
   SPIRVId ExtSetId = BM->getExtInstSetId(SPIRVEIS_Debug);
   return BM->addExtInst(getVoidTy(), ExtSetId, SPIRVDebug::Declare, Ops, BB);
 }
 
-void LLVMToSPIRVDbgTran::finalizeDebugDeclare(const DbgDeclareInst *DbgDecl) {
+void LLVMToSPIRVDbgTran::finalizeDebugDeclare(
+    const DbgVariableIntrinsic *DbgDecl) {
   SPIRVValue *V = SPIRVWriter->getTranslatedValue(DbgDecl);
   assert(V && "llvm.dbg.declare intrinsic isn't mapped to a SPIRV instruction");
   assert(V->isExtInst(SPIRV::SPIRVEIS_Debug, SPIRVDebug::Declare) &&
@@ -100,7 +100,7 @@ void LLVMToSPIRVDbgTran::finalizeDebugDeclare(const DbgDeclareInst *DbgDecl) {
     return;
   SPIRVExtInst *DD = static_cast<SPIRVExtInst *>(V);
   SPIRVBasicBlock *BB = DD->getBasicBlock();
-  llvm::Value *Alloca = DbgDecl->getAddress();
+  llvm::Value *Alloca = DbgDecl->getVariableLocation();
 
   using namespace SPIRVDebug::Operand::DebugDeclare;
   SPIRVWordVec Ops(OperandCount);
@@ -113,10 +113,9 @@ void LLVMToSPIRVDbgTran::finalizeDebugDeclare(const DbgDeclareInst *DbgDecl) {
 
 // llvm.dbg.value intrinsic.
 
-SPIRVValue *
-LLVMToSPIRVDbgTran::createDebugValuePlaceholder(const DbgValueInst *DbgValue,
-                                                SPIRVBasicBlock *BB) {
-  if (!DbgValue->getValue())
+SPIRVValue *LLVMToSPIRVDbgTran::createDebugValuePlaceholder(
+    const DbgVariableIntrinsic *DbgValue, SPIRVBasicBlock *BB) {
+  if (!DbgValue->getVariableLocation(/* AllowNullOp = */ false))
     return nullptr; // It is pointless without new value
 
   DbgValueIntrinsics.push_back(DbgValue);
@@ -126,7 +125,8 @@ LLVMToSPIRVDbgTran::createDebugValuePlaceholder(const DbgValueInst *DbgValue,
   return BM->addExtInst(getVoidTy(), ExtSetId, SPIRVDebug::Value, Ops, BB);
 }
 
-void LLVMToSPIRVDbgTran::finalizeDebugValue(const DbgValueInst *DbgValue) {
+void LLVMToSPIRVDbgTran::finalizeDebugValue(
+    const DbgVariableIntrinsic *DbgValue) {
   SPIRVValue *V = SPIRVWriter->getTranslatedValue(DbgValue);
   assert(V && "llvm.dbg.value intrinsic isn't mapped to a SPIRV instruction");
   assert(V->isExtInst(SPIRV::SPIRVEIS_Debug, SPIRVDebug::Value) &&
@@ -135,7 +135,7 @@ void LLVMToSPIRVDbgTran::finalizeDebugValue(const DbgValueInst *DbgValue) {
     return;
   SPIRVExtInst *DV = static_cast<SPIRVExtInst *>(V);
   SPIRVBasicBlock *BB = DV->getBasicBlock();
-  Value *Val = DbgValue->getValue();
+  Value *Val = DbgValue->getVariableLocation(/* AllowNullOp = */ false);
 
   using namespace SPIRVDebug::Operand::DebugValue;
   SPIRVWordVec Ops(MinOperandCount);

llvm-spirv/lib/SPIRV/LLVMToSPIRVDbgTran.h

@@ -68,17 +68,17 @@ class LLVMToSPIRVDbgTran {
   //   but with dummy operands. Doing so we a) map llvm value to spirv value,
   //   b) get a place for SPIRV debug info intrinsic in SPIRV basic block.
   //   We also remember all debug intrinsics.
-  SPIRVValue *createDebugDeclarePlaceholder(const DbgDeclareInst *DbgDecl,
+  SPIRVValue *createDebugDeclarePlaceholder(const DbgVariableIntrinsic *DbgDecl,
                                             SPIRVBasicBlock *BB);
-  SPIRVValue *createDebugValuePlaceholder(const DbgValueInst *DbgValue,
+  SPIRVValue *createDebugValuePlaceholder(const DbgVariableIntrinsic *DbgValue,
                                           SPIRVBasicBlock *BB);
 
 private:
   // 2. After translation of all regular instructions we deal with debug info.
   //   We iterate over debug intrinsics stored on the first step, get its mapped
   //   SPIRV instruction and tweak the operands.
-  void finalizeDebugDeclare(const DbgDeclareInst *DbgDecl);
-  void finalizeDebugValue(const DbgValueInst *DbgValue);
+  void finalizeDebugDeclare(const DbgVariableIntrinsic *DbgDecl);
+  void finalizeDebugValue(const DbgVariableIntrinsic *DbgValue);
 
   // Emit DebugScope and OpLine instructions
   void transLocationInfo();
@@ -154,8 +154,8 @@ class LLVMToSPIRVDbgTran {
   SPIRVType *VoidT;
   SPIRVEntry *DebugInfoNone;
   SPIRVExtInst *SPIRVCU;
-  std::vector<const DbgDeclareInst *> DbgDeclareIntrinsics;
-  std::vector<const DbgValueInst *> DbgValueIntrinsics;
+  std::vector<const DbgVariableIntrinsic *> DbgDeclareIntrinsics;
+  std::vector<const DbgVariableIntrinsic *> DbgValueIntrinsics;
 }; // class LLVMToSPIRVDbgTran
 
 } // namespace SPIRV