get rid of deprecated DbgVariableIntrinsic wrapper, fix issue with LLVM-13 build.

get rid of deprecated DbgVariableIntrinsic wrapper, fix issue with LLVM-13 build.

Author: aparshin-intel

IGC/DebugInfo/DwarfCompileUnit.cpp

@@ -203,7 +203,7 @@ int64_t CompileUnit::getDefaultLowerBound() const
 }
 
 static bool HasImplicitLocation(const DbgVariable& var) {
-    if (auto* dbgInst = dyn_cast_or_null<IGCLLVM::DbgVariableIntrinsic>(var.getDbgInst()))
+    if (auto* dbgInst = var.getDbgInst())
         if (auto* expr = dbgInst->getExpression())
             return expr->isImplicit();
     return false;
@@ -2625,9 +2625,9 @@ IGC::DIEBlock* CompileUnit::buildGeneral(const DbgVariable& var,
 
     auto EmitExpression = [this](IGC::DIEBlock* Block, const DbgVariable& var) {
         // Emit DIExpression if it exists
-        if (auto dbgInst = dyn_cast_or_null<IGCLLVM::DbgVariableIntrinsic>(var.getDbgInst()))
+        if (auto* dbgInst = var.getDbgInst())
         {
-            if (auto expr = dbgInst->getExpression())
+            if (auto* expr = dbgInst->getExpression())
             {
                 for (auto elem : expr->getElements())
                 {

IGC/DebugInfo/DwarfDebug.cpp

@@ -1592,7 +1592,7 @@ void DwarfDebug::collectVariableInfo(const Function* MF, SmallPtrSet<const MDNod
         // If a function is inlined x times, there would be x number of DbgVariable instances.
         using DbgVarIPInfo =
             std::tuple<unsigned int, unsigned int, DbgVariable*,
-                       const IGCLLVM::DbgVariableIntrinsic*>;
+                       const llvm::DbgVariableIntrinsic*>;
         // TODO: consider replacing std::list to std::vector
         std::unordered_map<DbgVariable*, std::list<DbgVarIPInfo>> DbgValuesWithGenIP;
         for (auto HI = History.begin(), HE = History.end(); HI != HE; HI++)
@@ -1621,7 +1621,7 @@ void DwarfDebug::collectVariableInfo(const Function* MF, SmallPtrSet<const MDNod
                 continue;
 
             Processed.insert(DV);
-            const IGCLLVM::DbgVariableIntrinsic* pInst = H; // History.front();
+            const llvm::DbgVariableIntrinsic* pInst = H; // History.front();
 
             IGC_ASSERT_MESSAGE(IsDebugInst(pInst),
                                "History must begin with debug instruction");
@@ -1742,7 +1742,7 @@ void DwarfDebug::collectVariableInfo(const Function* MF, SmallPtrSet<const MDNod
                 uint64_t start = 0;
                 uint64_t end = 0;
                 DbgVariable* dbgVar = nullptr;
-                const IGCLLVM::DbgVariableIntrinsic* pInst = nullptr;
+                const llvm::DbgVariableIntrinsic* pInst = nullptr;
                 const ConstantInt* imm = nullptr;
 
                 std::vector<VISAVariableLocation> Locs;
@@ -2262,7 +2262,7 @@ void DwarfDebug::beginFunction(const Function* MF, IGC::VISAModule* v)
                     History.pop_back();
                 }
             }
-            History.push_back(cast<IGCLLVM::DbgVariableIntrinsic>(MI));
+            History.push_back(cast<llvm::DbgVariableIntrinsic>(MI));
         }
         else if(m_pModule->IsExecutableInst(*MI))
         {

IGC/DebugInfo/DwarfDebug.hpp

@@ -72,7 +72,7 @@ namespace IGC
         uint32_t offset = 0;
 
         // The location in the machine frame.
-        const IGCLLVM::DbgVariableIntrinsic* m_pDbgInst = nullptr;
+        const llvm::DbgVariableIntrinsic* m_pDbgInst = nullptr;
 
         // The variable to which this location entry corresponds.
         const llvm::MDNode* Variable = nullptr;
@@ -84,19 +84,19 @@ namespace IGC
 
         DotDebugLocEntry() : m_pDbgInst(nullptr), Variable(nullptr) { }
         DotDebugLocEntry(const llvm::MCSymbol* B, const llvm::MCSymbol* E,
-                         const IGCLLVM::DbgVariableIntrinsic* pDbgInst,
+                         const llvm::DbgVariableIntrinsic* pDbgInst,
                          const llvm::MDNode* V)
             : m_pDbgInst(pDbgInst), Variable(V) { }
         DotDebugLocEntry(const uint64_t s, const uint64_t e,
-                         const IGCLLVM::DbgVariableIntrinsic* pDbgInst,
+                         const llvm::DbgVariableIntrinsic* pDbgInst,
                          const llvm::MDNode* V)
             : start(s), end(e), m_pDbgInst(pDbgInst), Variable(V) {}
 
         /// \brief Empty entries are also used as a trigger to emit temp label. Such
         /// labels are referenced is used to find debug_loc offset for a given DIE.
         bool isEmpty() const { return start == 0 && end == 0; }
         const llvm::MDNode* getVariable() const { return Variable; }
-        const IGCLLVM::DbgVariableIntrinsic* getDbgInst() const { return m_pDbgInst; }
+        const llvm::DbgVariableIntrinsic* getDbgInst() const { return m_pDbgInst; }
         uint64_t getStart() const { return start; }
         uint64_t getEnd() const { return end; }
 
@@ -128,7 +128,7 @@ namespace IGC
         // Corresponding Abstract variable, if any
         DbgVariable* AbsVar = nullptr;
         // DBG_VALUE instruction of the variable
-        const IGCLLVM::DbgVariableIntrinsic* m_pDbgInst = nullptr;
+        const llvm::DbgVariableIntrinsic* m_pDbgInst = nullptr;
 
     public:
 
@@ -150,8 +150,8 @@ namespace IGC
         llvm::StringRef getName() const { return Var->getName(); }
         DbgVariable* getAbstractVariable() const { return AbsVar; }
 
-        const IGCLLVM::DbgVariableIntrinsic* getDbgInst() const { return m_pDbgInst; }
-        void setDbgInst(const IGCLLVM::DbgVariableIntrinsic* pInst) { m_pDbgInst = pInst; }
+        const llvm::DbgVariableIntrinsic* getDbgInst() const { return m_pDbgInst; }
+        void setDbgInst(const llvm::DbgVariableIntrinsic* pInst) { m_pDbgInst = pInst; }
 
         /// If this type is derived from a base type then return base type size
         /// even if it derived directly or indirectly from Composite Type
@@ -344,7 +344,7 @@ namespace IGC
         // For each user variable, keep a list of DBG_VALUE instructions in order.
         // The list can also contain normal instructions that clobber the previous
         // DBG_VALUE.
-        using InstructionsList = llvm::SmallVector<const IGCLLVM::DbgVariableIntrinsic*, 4>;
+        using InstructionsList = llvm::SmallVector<const llvm::DbgVariableIntrinsic*, 4>;
         typedef llvm::DenseMap<const llvm::MDNode*, InstructionsList> DbgValueHistoryMap;
         DbgValueHistoryMap DbgValues;
 

IGC/WrapperLLVM/include/llvmWrapper/IR/IntrinsicInst.h

@@ -16,20 +16,13 @@ SPDX-License-Identifier: MIT
 
 namespace IGCLLVM
 {
-// TODO: remove support for LLVM 7
-#if LLVM_VERSION_MAJOR <= 7
-    using DbgVariableIntrinsic = llvm::DbgInfoIntrinsic;
-#else
-    using llvm::DbgVariableIntrinsic;
-#endif
-
-    inline llvm::Value* getVariableLocation(const DbgVariableIntrinsic* DbgInst)
+    inline llvm::Value* getVariableLocation(const llvm::DbgVariableIntrinsic* DbgInst)
     {
         IGC_ASSERT(DbgInst);
 #if LLVM_VERSION_MAJOR <= 12
         return DbgInst->getVariableLocation();
 #else
-        IGC_ASSERT_MESSAGE(getNumVariableLocationOps() == 1,
+        IGC_ASSERT_MESSAGE(DbgInst->getNumVariableLocationOps() == 1,
                            "unsupported number of location ops");
         return DbgInst->getVariableLocationOp(0);
 #endif