Merge pull request #21584 from dcci/setdebug2

[SILInstruction] Remove unused arg in setDebugScope()

Author: dcci

include/swift/SIL/SILInstruction.h

@@ -326,7 +326,7 @@ class SILInstruction
   /// Update this instruction's SILDebugScope. This function should
   /// never be called directly. Use SILBuilder, SILBuilderWithScope or
   /// SILClonerWithScope instead.
-  void setDebugScope(SILBuilder &B, const SILDebugScope *DS);
+  void setDebugScope(const SILDebugScope *DS);
 
   /// Total number of created and deleted SILInstructions.
   /// It is used only for collecting the compiler statistics.

lib/SIL/SILBasicBlock.cpp

@@ -260,8 +260,7 @@ void SILBasicBlock::moveTo(SILBasicBlock::iterator To, SILInstruction *I) {
   assert(I->getParent() != this && "Must move from different basic block");
   InstList.splice(To, I->getParent()->InstList, I);
   ScopeCloner ScopeCloner(*Parent);
-  SILBuilder B(*Parent);
-  I->setDebugScope(B, ScopeCloner.getOrCreateClonedScope(I->getDebugScope()));
+  I->setDebugScope(ScopeCloner.getOrCreateClonedScope(I->getDebugScope()));
 }
 
 void
@@ -277,14 +276,12 @@ transferNodesFromList(llvm::ilist_traits<SILBasicBlock> &SrcTraits,
     return;
 
   ScopeCloner ScopeCloner(*Parent);
-  SILBuilder B(*Parent);
 
   // If splicing blocks not in the same function, update the parent pointers.
   for (; First != Last; ++First) {
     First->Parent = Parent;
     for (auto &II : *First)
-      II.setDebugScope(B,
-                       ScopeCloner.getOrCreateClonedScope(II.getDebugScope()));
+      II.setDebugScope(ScopeCloner.getOrCreateClonedScope(II.getDebugScope()));
   }
 }
 

lib/SIL/SILInstruction.cpp

@@ -41,7 +41,7 @@ const SILDebugScope *SILInstruction::getDebugScope() const {
   return Location.getScope();
 }
 
-void SILInstruction::setDebugScope(SILBuilder &B, const SILDebugScope *DS) {
+void SILInstruction::setDebugScope(const SILDebugScope *DS) {
   if (getDebugScope() && getDebugScope()->InlinedCallSite)
     assert(DS->InlinedCallSite && "throwing away inlined scope info");