Merge pull request swiftlang#2084 from eeckstein/remove_from_parent

Remove removeFromParent

Author: eeckstein

include/swift/SIL/SILBasicBlock.h

@@ -74,9 +74,6 @@ public llvm::ilist_node<SILBasicBlock>, public SILAllocated<SILBasicBlock> {
   /// This method unlinks 'self' from the containing SILFunction and deletes it.
   void eraseFromParent();
 
-  /// This method unlinks 'self' from the containing SILFunction.
-  void removeFromParent();
-
   /// Returns true if this BB is the entry BB of its parent.
   bool isEntry() const;
 

lib/SIL/SILBasicBlock.cpp

@@ -103,12 +103,6 @@ void SILBasicBlock::eraseFromParent() {
   getParent()->getBlocks().erase(this);
 }
 
-/// This method unlinks 'self' from the containing SILFunction.
-void SILBasicBlock::removeFromParent() {
-  getParent()->getBlocks().remove(this);
-}
-
-
 /// Replace the ith BB argument with a new one with type Ty (and optional
 /// ValueDecl D).
 SILArgument *SILBasicBlock::replaceBBArg(unsigned i, SILType Ty,

lib/SILOptimizer/Transforms/SpeculativeDevirtualizer.cpp

@@ -153,12 +153,19 @@ static FullApplySite speculateMonomorphicTarget(FullApplySite AI,
   }
 
   // Remove the old Apply instruction.
-  if (!isa<TryApplyInst>(AI))
+  assert(AI.getInstruction() == &Continue->front() &&
+         "AI should be the first instruction in the split Continue block");
+  if (!isa<TryApplyInst>(AI)) {
     AI.getInstruction()->replaceAllUsesWith(Arg);
-  auto *OriginalBB = AI.getParent();
-  AI.getInstruction()->eraseFromParent();
-  if (OriginalBB->empty())
-    OriginalBB->removeFromParent();
+    AI.getInstruction()->eraseFromParent();
+    assert(!Continue->empty() &&
+           "There should be at least a terminator after AI");
+  } else {
+    AI.getInstruction()->eraseFromParent();
+    assert(Continue->empty() &&
+           "There should not be an instruction after try_apply");
+    Continue->eraseFromParent();
+  }
 
   // Update the stats.
   NumTargetsPredicted++;