[gardening] SILBasicBlock::splitBasicBlock() => *::split().

The BasicBlock suffix is redundant.

Author: gottesmm

include/swift/SIL/SILBasicBlock.h

@@ -132,7 +132,7 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   /// Note that all the instructions BEFORE the specified iterator
   /// stay as part of the original basic block. The old basic block is left
   /// without a terminator.
-  SILBasicBlock *splitBasicBlock(iterator I);
+  SILBasicBlock *split(iterator I);
 
   /// \brief Move the basic block to after the specified basic block in the IR.
   /// The basic blocks must reside in the same function.

lib/SIL/SILBasicBlock.cpp

@@ -146,7 +146,7 @@ void SILBasicBlock::eraseArgument(int Index) {
 /// Note that all the instructions BEFORE the specified iterator
 /// stay as part of the original basic block. The old basic block is left
 /// without a terminator.
-SILBasicBlock *SILBasicBlock::splitBasicBlock(iterator I) {
+SILBasicBlock *SILBasicBlock::split(iterator I) {
   SILBasicBlock *New = new (Parent->getModule()) SILBasicBlock(Parent);
   SILFunction::iterator Where = std::next(SILFunction::iterator(this));
   SILFunction::iterator First = SILFunction::iterator(New);

lib/SIL/SILBuilder.cpp

@@ -142,7 +142,7 @@ SILBasicBlock *SILBuilder::splitBlockForFallthrough() {
   }
 
   // Otherwise we need to split the current block at the insertion point.
-  auto *NewBB = BB->splitBasicBlock(InsertPt);
+  auto *NewBB = BB->split(InsertPt);
   InsertPt = BB->end();
   return NewBB;
 }

lib/SILOptimizer/IPO/EagerSpecializer.cpp

@@ -106,12 +106,12 @@ static void addReturnValueImpl(SILBasicBlock *RetBB, SILBasicBlock *NewRetBB,
         TupleI = TupleI->clone(RetInst);
         RetInst->setOperand(0, TupleI);
       }
-      MergedBB = RetBB->splitBasicBlock(TupleI->getIterator());
+      MergedBB = RetBB->split(TupleI->getIterator());
       Builder.setInsertionPoint(RetBB);
       Builder.createBranch(Loc, MergedBB);
     } else {
       // Forward the existing return argument to a new BBArg.
-      MergedBB = RetBB->splitBasicBlock(RetInst->getIterator());
+      MergedBB = RetBB->split(RetInst->getIterator());
       SILValue OldRetVal = RetInst->getOperand(0);
       RetInst->setOperand(0, MergedBB->createArgument(OldRetVal->getType()));
       Builder.setInsertionPoint(RetBB);
@@ -255,7 +255,7 @@ void EagerDispatch::emitDispatchTo(SILFunction *NewFunc) {
 
   // First split the entry BB, moving all instructions to the FailedTypeCheckBB.
   auto &EntryBB = GenericFunc->front();
-  SILBasicBlock *FailedTypeCheckBB = EntryBB.splitBasicBlock(EntryBB.begin());
+  SILBasicBlock *FailedTypeCheckBB = EntryBB.split(EntryBB.begin());
   Builder.setInsertionPoint(&EntryBB, EntryBB.begin());
 
   // Iterate over all dependent types in the generic signature, which will match

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -127,8 +127,8 @@ static void InsertCFGDiamond(SILValue Cond, SILLocation Loc, SILBuilder &B,
   SILBasicBlock *StartBB = B.getInsertionBB();
 
   // Start by splitting the current block.
-  ContBB = StartBB->splitBasicBlock(B.getInsertionPoint());
-  
+  ContBB = StartBB->split(B.getInsertionPoint());
+
   // Create the true block if requested.
   SILBasicBlock *TrueDest;
   if (!createTrueBB) {

lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp

@@ -109,7 +109,7 @@ static FullApplySite speculateMonomorphicTarget(FullApplySite AI,
   SILBasicBlock *Virt = F->createBasicBlock();
   Iden->createArgument(SubType);
 
-  SILBasicBlock *Continue = Entry->splitBasicBlock(It);
+  SILBasicBlock *Continue = Entry->split(It);
 
   SILBuilderWithScope Builder(Entry, AI.getInstruction());
   // Create the checked_cast_branch instruction that checks at runtime if the

lib/SILOptimizer/Utils/CFG.cpp

@@ -548,7 +548,7 @@ SILBasicBlock *swift::splitBasicBlockAndBranch(SILBuilder &B,
                                                DominanceInfo *DT,
                                                SILLoopInfo *LI) {
   auto *OrigBB = SplitBeforeInst->getParent();
-  auto *NewBB = OrigBB->splitBasicBlock(SplitBeforeInst->getIterator());
+  auto *NewBB = OrigBB->split(SplitBeforeInst->getIterator());
   B.setInsertionPoint(OrigBB);
   B.createBranch(SplitBeforeInst->getLoc(), NewBB);
 

lib/SILOptimizer/Utils/Local.cpp

@@ -580,7 +580,7 @@ Optional<SILValue> swift::castValueToABICompatibleType(SILBuilder *B, SILLocatio
     auto *SomeBB = B->getFunction().createBasicBlock();
     auto *CurBB = B->getInsertionPoint()->getParent();
 
-    auto *ContBB = CurBB->splitBasicBlock(B->getInsertionPoint());
+    auto *ContBB = CurBB->split(B->getInsertionPoint());
     ContBB->createArgument(DestTy, nullptr);
 
     SmallVector<std::pair<EnumElementDecl *, SILBasicBlock *>, 1> CaseBBs;

lib/SILOptimizer/Utils/SILInliner.cpp

@@ -127,7 +127,7 @@ bool SILInliner::inlineFunction(FullApplySite AI, ArrayRef<SILValue> Args) {
     SILBasicBlock *CallerBB = AI.getParent();
     // Split the BB and do NOT create a branch between the old and new
     // BBs; we will create the appropriate terminator manually later.
-    ReturnToBB = CallerBB->splitBasicBlock(InsertPoint);
+    ReturnToBB = CallerBB->split(InsertPoint);
     // Place the return-to BB after all the other mapped BBs.
     if (InsertBeforeBB)
       F.getBlocks().splice(SILFunction::iterator(InsertBeforeBB), F.getBlocks(),

tools/sil-extract/SILExtract.cpp

@@ -116,7 +116,7 @@ removeUnwantedFunctions(SILModule *M, llvm::StringRef Name) {
         SILBasicBlock &BB = F.front();
 
         SILLocation Loc = BB.back().getLoc();
-        BB.splitBasicBlock(BB.begin());
+        BB.split(BB.begin());
         // Make terminator unreachable.
         SILBuilder(&BB).createUnreachable(Loc);