More LLVM 18 fixups.

* FindDbgDeclareUses got refactored, we have to call findDbgDeclares. * DIBuilder::createStaticMemberType takes a DWARF tag now. Since we are processing a DebugTypeMember, we know it is always a data member and can set the tag to DW_TAG_variable.
uxlfoundation · Dec 18, 2023 · 74ba46d · 74ba46d
1 parent 6c335c1
commit 74ba46d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/modules/compiler/spirv-ll/source/builder_debug_info.cpp b/modules/compiler/spirv-ll/source/builder_debug_info.cpp
@@ -994,9 +994,15 @@ llvm::Expected<llvm::MDNode *> DebugInfoBuilder::translate(
                              getIDAsStr(op->IdResult(), &module) +
                              " is not an OpConstant");
     }
+#if LLVM_VERSION_GREATER_EQUAL(18, 0)
+    return getDIBuilder(op).createStaticMemberType(
+        scope, *name, file, op->Line(), base_ty, flags,
+        cast<llvm::Constant>(val), llvm::dwarf::DW_TAG_variable);
+#else
     return getDIBuilder(op).createStaticMemberType(scope, *name, file,
                                                    op->Line(), base_ty, flags,
                                                    cast<llvm::Constant>(val));
+#endif
   }
 
   auto size_or_error = getConstantIntValue(op->Size());

diff --git a/modules/compiler/utils/source/barrier_regions.cpp b/modules/compiler/utils/source/barrier_regions.cpp
@@ -916,7 +916,10 @@ void compiler::utils::Barrier::MakeLiveVariableMemType() {
 
     // Check if the alloca has a debug info source variable attached. If
     // so record this and the matching byte offset into the struct.
-#if LLVM_VERSION_GREATER_EQUAL(17, 0)
+#if LLVM_VERSION_GREATER_EQUAL(18, 0)
+    SmallVector<DbgDeclareInst *, 1> DbgIntrinsics;
+    findDbgDeclares(DbgIntrinsics, member.value);
+#elif LLVM_VERSION_GREATER_EQUAL(17, 0)
     auto DbgIntrinsics = FindDbgDeclareUses(member.value);
 #else
     auto DbgIntrinsics = FindDbgAddrUses(member.value);

diff --git a/modules/compiler/vecz/source/transform/basic_mem2reg_pass.cpp b/modules/compiler/vecz/source/transform/basic_mem2reg_pass.cpp
@@ -183,7 +183,10 @@ bool BasicMem2RegPass::promoteAlloca(AllocaInst *Alloca) const {
       StoredValue = Store->getValueOperand();
       ToDelete.push_back(Store);
       DIBuilder DIB(*Alloca->getModule(), /*AllowUnresolved*/ false);
-#if LLVM_VERSION_GREATER_EQUAL(17, 0)
+#if LLVM_VERSION_GREATER_EQUAL(18, 0)
+      SmallVector<DbgDeclareInst *, 1> DbgIntrinsics;
+      findDbgDeclares(DbgIntrinsics, Alloca);
+#elif LLVM_VERSION_GREATER_EQUAL(17, 0)
       auto DbgIntrinsics = FindDbgDeclareUses(Alloca);
 #else
       auto DbgIntrinsics = FindDbgAddrUses(Alloca);