[pa-combiner] Simplify some cleanup code by using FullApplySite::insertAfterFullInvocation.

Author: gottesmm

lib/SILOptimizer/Utils/PartialApplyCombiner.cpp

@@ -254,29 +254,16 @@ bool PartialApplyCombiner::processSingleApply(FullApplySite paiAI) {
 
   // We also need to destroy the partial_apply instruction itself because it is
   // consumed by the apply_instruction.
-  if (auto *tai = dyn_cast<TryApplyInst>(paiAI)) {
-    builder.setInsertionPoint(tai->getNormalBB()->begin());
+  auto loc = RegularLocation::getAutoGeneratedLocation();
+  paiAI.insertAfterFullEvaluation([&](SILBasicBlock::iterator insertPt) {
+    SILBuilderWithScope builder(insertPt);
     for (auto arg : toBeDestroyedArgs) {
-      builder.emitDestroyValueOperation(pai->getLoc(), arg);
+      builder.emitDestroyValueOperation(loc, arg);
     }
-    if (!pai->hasCalleeGuaranteedContext())
-      builder.emitDestroyValueOperation(paiAI.getLoc(), pai);
-    builder.setInsertionPoint(tai->getErrorBB()->begin());
-    // Destroy the non-consumed parameters.
-    for (auto arg : toBeDestroyedArgs) {
-      builder.emitDestroyValueOperation(pai->getLoc(), arg);
-    }
-    if (!pai->hasCalleeGuaranteedContext())
-      builder.emitDestroyValueOperation(pai->getLoc(), pai);
-    builder.setInsertionPoint(paiAI.getInstruction());
-  } else {
-    // Destroy the non-consumed parameters.
-    for (auto arg : toBeDestroyedArgs) {
-      builder.emitDestroyValueOperation(pai->getLoc(), arg);
+    if (!pai->hasCalleeGuaranteedContext()) {
+      builder.emitDestroyValueOperation(loc, pai);
     }
-    if (!pai->hasCalleeGuaranteedContext())
-      builder.emitDestroyValueOperation(pai->getLoc(), pai);
-  }
+  });
 
   if (auto *apply = dyn_cast<ApplyInst>(paiAI)) {
     callbacks.replaceValueUsesWith(SILValue(apply),