[NFC][Utils] Remove DebugInfoFinder parameter from CloneBasicBlock

[artempyanykh]

Stacked PRs:

• [Coro] Use DebugInfoCache to speed up cloning in CoroSplitPass #118630
• [Analysis] Add DebugInfoCache analysis #118629
• [Coro] Prebuild a module-level debug info set and share it between all coroutine clones #118628
• [Utils] Identity map module-level debug info on first use in CloneFunction* #118627
• [NFC] Remove adhoc definition of MDMapT in IRMover #118626
• [NFC][Utils] Eliminate DISubprogram set from BuildDebugInfoMDMap #118625
• [NFC][Utils] Extract CloneFunctionBodyInto from CloneFunctionInto #118624
• [NFC][Utils] Extract CloneFunctionMetadataInto from CloneFunctionInto #118623
• [NFC][Utils] Extract BuildDebugInfoMDMap from CloneFunctionInto #118622
• [NFC][Utils] Clone basic blocks after we're done with metadata in CloneFunctionInto #118621
• ->[NFC][Utils] Remove DebugInfoFinder parameter from CloneBasicBlock #118620

---

[NFC][Utils] Remove DebugInfoFinder parameter from CloneBasicBlock

Summary:
There was a single usage of CloneBasicBlock with non-default
DebugInfoFinder inside CloneFunctionInto which has been refactored in
more focused.

Test Plan:
ninja check-llvm-unit check-llvm

[llvmbot]

@llvm/pr-subscribers-llvm-transforms

Author: Artem Pianykh (artempyanykh)

Changes

[NFC][Utils] Remove DebugInfoFinder parameter from CloneBasicBlock

Summary:
There was a single usage of CloneBasicBlock with non-default
DebugInfoFinder inside CloneFunctionInto which has been refactored in
more focused.

Test Plan:
ninja check-llvm-unit check-llvm

---

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

2 Files Affected:

• (modified) llvm/include/llvm/Transforms/Utils/Cloning.h (+1-2)
• (modified) llvm/lib/Transforms/Utils/CloneFunction.cpp (+2-10)

diff --git a/llvm/include/llvm/Transforms/Utils/Cloning.h b/llvm/include/llvm/Transforms/Utils/Cloning.h
index 049d68b8a30681..3c8f2cbfaa9b81 100644
--- a/llvm/include/llvm/Transforms/Utils/Cloning.h
+++ b/llvm/include/llvm/Transforms/Utils/Cloning.h
@@ -119,8 +119,7 @@ struct ClonedCodeInfo {
 /// parameter.
 BasicBlock *CloneBasicBlock(const BasicBlock *BB, ValueToValueMapTy &VMap,
                             const Twine &NameSuffix = "", Function *F = nullptr,
-                            ClonedCodeInfo *CodeInfo = nullptr,
-                            DebugInfoFinder *DIFinder = nullptr);
+                            ClonedCodeInfo *CodeInfo = nullptr);
 
 /// Return a copy of the specified function and add it to that
 /// function's module.  Also, any references specified in the VMap are changed
diff --git a/llvm/lib/Transforms/Utils/CloneFunction.cpp b/llvm/lib/Transforms/Utils/CloneFunction.cpp
index cb6a4e34c226e5..b55776d736e663 100644
--- a/llvm/lib/Transforms/Utils/CloneFunction.cpp
+++ b/llvm/lib/Transforms/Utils/CloneFunction.cpp
@@ -43,21 +43,16 @@ using namespace llvm;
 /// See comments in Cloning.h.
 BasicBlock *llvm::CloneBasicBlock(const BasicBlock *BB, ValueToValueMapTy &VMap,
                                   const Twine &NameSuffix, Function *F,
-                                  ClonedCodeInfo *CodeInfo,
-                                  DebugInfoFinder *DIFinder) {
+                                  ClonedCodeInfo *CodeInfo) {
   BasicBlock *NewBB = BasicBlock::Create(BB->getContext(), "", F);
   NewBB->IsNewDbgInfoFormat = BB->IsNewDbgInfoFormat;
   if (BB->hasName())
     NewBB->setName(BB->getName() + NameSuffix);
 
   bool hasCalls = false, hasDynamicAllocas = false, hasMemProfMetadata = false;
-  Module *TheModule = F ? F->getParent() : nullptr;
 
   // Loop over all instructions, and copy them over.
   for (const Instruction &I : *BB) {
-    if (DIFinder && TheModule)
-      DIFinder->processInstruction(*TheModule, I);
-
     Instruction *NewInst = I.clone();
     if (I.hasName())
       NewInst->setName(I.getName() + NameSuffix);
@@ -221,10 +216,7 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
   for (const BasicBlock &BB : *OldFunc) {
 
     // Create a new basic block and copy instructions into it!
-    // NOTE: don't pass DIFinder because instructions' debug info was processed
-    // in ProcessSubprogramAttachment. This will be cleaned up further.
-    BasicBlock *CBB =
-        CloneBasicBlock(&BB, VMap, NameSuffix, NewFunc, CodeInfo, nullptr);
+    BasicBlock *CBB = CloneBasicBlock(&BB, VMap, NameSuffix, NewFunc, CodeInfo);
 
     // Add basic block mapping.
     VMap[&BB] = CBB;

[TylerNowicki]

I looked through the PR stack. I don't have any objections. Although I don't have much familiarity with how DebugInfo is used. LGTM

[artempyanykh]

I looked through the PR stack. I don't have any objections. Although I don't have much familiarity with how DebugInfo is used. LGTM

Thanks for having a look at the stack @TylerNowicki! Just in case, there's a bit more info on the stack in #109032 and this topic.