Merge pull request #320 from PietroGhg/pietro/finddbgdeclare

Update findDbgDeclares for LLVM 18
uxlfoundation · Jan 30, 2024 · 49722f9 · 49722f9
2 parents 1dda1f5 + af4e37d
commit 49722f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/modules/compiler/utils/source/barrier_regions.cpp b/modules/compiler/utils/source/barrier_regions.cpp
@@ -971,8 +971,7 @@ 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(18, 0)
-    SmallVector<DbgDeclareInst *, 1> DbgIntrinsics;
-    findDbgDeclares(DbgIntrinsics, member.value);
+    auto DbgIntrinsics = findDbgDeclares(member.value);
 #elif LLVM_VERSION_GREATER_EQUAL(17, 0)
     auto DbgIntrinsics = FindDbgDeclareUses(member.value);
 #else

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