Remove emitCleanup and use folding builder methods.

Author: rxwei

lib/SILOptimizer/Mandatory/Differentiation.cpp

@@ -1916,14 +1916,6 @@ static SILValue joinElements(ArrayRef<SILValue> elements, SILBuilder &builder,
   return builder.createTuple(loc, elements);
 }
 
-// Emits a release based on the value's type category (address or object).
-static void emitCleanup(SILBuilder &builder, SILLocation loc, SILValue v) {
-  if (v->getType().isAddress())
-    builder.createDestroyAddr(loc, v);
-  else
-    builder.createReleaseValue(loc, v, builder.getDefaultAtomicity());
-}
-
 /// When a function value is used in an instruction (usually `apply`), there's
 /// some conversion instruction in between, e.g. `thin_to_thick_function`. Given
 /// a new function value and an old function value, this helper function
@@ -3407,8 +3399,7 @@ class VJPEmitter final
 
     // Release the differentiable function.
     if (differentiableFunc)
-      builder.createReleaseValue(loc, differentiableFunc,
-                                 builder.getDefaultAtomicity());
+      builder.emitReleaseValueAndFold(loc, differentiableFunc);
 
     // Get the VJP results (original results and pullback).
     SmallVector<SILValue, 8> vjpDirectResults;
@@ -3974,7 +3965,7 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
     LLVM_DEBUG(getADDebugStream() << "Cleaning up temporaries for bb"
                << bb->getDebugID() << '\n');
     for (auto temp : blockTemporaries[bb]) {
-      emitCleanup(builder, loc, temp);
+      builder.emitReleaseValueAndFold(loc, temp);
       blockTemporarySet.erase(temp);
     }
   }
@@ -4846,7 +4837,7 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
       ApplyInst *ai, CopyAddrInst *cai, AllocStackInst *subscriptBuffer) {
     addToAdjointBuffer(cai->getParent(), cai->getSrc(), subscriptBuffer,
                        cai->getLoc());
-    emitCleanup(builder, cai->getLoc(), subscriptBuffer);
+    builder.emitDestroyAddrAndFold(cai->getLoc(), subscriptBuffer);
     builder.createDeallocStack(ai->getLoc(), subscriptBuffer);
   }
 
@@ -5042,7 +5033,7 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
       auto tan = *allResultsIt++;
       if (tan->getType().isAddress()) {
         addToAdjointBuffer(bb, origArg, tan, loc);
-        emitCleanup(builder, loc, tan);
+        builder.emitDestroyAddrAndFold(loc, tan);
       } else {
         if (origArg->getType().isAddress()) {
           if (errorOccurred)
@@ -5051,7 +5042,7 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
           builder.createStore(loc, tan, tmpBuf,
               getBufferSOQ(tmpBuf->getType().getASTType(), getPullback()));
           addToAdjointBuffer(bb, origArg, tmpBuf, loc);
-          emitCleanup(builder, loc, tmpBuf);
+          builder.emitDestroyAddrAndFold(loc, tmpBuf);
           builder.createDeallocStack(loc, tmpBuf);
         }
         else {
@@ -5347,7 +5338,7 @@ class PullbackEmitter final : public SILInstructionVisitor<PullbackEmitter> {
       return;
     auto destType = remapType(adjDest->getType());
     addToAdjointBuffer(bb, cai->getSrc(), adjDest, cai->getLoc());
-    emitCleanup(builder, cai->getLoc(), adjDest);
+    builder.emitDestroyAddrAndFold(cai->getLoc(), adjDest);
     emitZeroIndirect(destType.getASTType(), adjDest, cai->getLoc());
   }
 
@@ -6306,13 +6297,15 @@ ADContext::getOrCreateSubsetParametersThunkForLinearMap(
     // - Push it to `results` if result is direct.
     auto result = allResults[mapOriginalParameterIndex(i)];
     if (desiredIndices.isWrtParameter(i)) {
-      if (result->getType().isAddress())
-        continue;
-      results.push_back(result);
+      if (result->getType().isObject())
+         results.push_back(result);
     }
     // Otherwise, cleanup the unused results.
     else {
-      emitCleanup(builder, loc, result);
+      if (result->getType().isAddress())
+        builder.emitDestroyAddrAndFold(loc, result);
+      else
+        builder.emitReleaseValueAndFold(loc, result);
     }
   }
   // Deallocate local allocations and return final direct result.
@@ -6685,7 +6678,7 @@ void ADContext::foldAutoDiffFunctionExtraction(AutoDiffFunctionInst *source) {
   if (isInstructionTriviallyDead(source)) {
     SILBuilder builder(source);
     for (auto &assocFn : source->getAssociatedFunctions())
-      emitCleanup(builder, source->getLoc(), assocFn.get());
+      builder.emitDestroyAddrAndFold(source->getLoc(), assocFn.get());
     source->eraseFromParent();
   }
   // Mark `source` as processed so that it won't be reprocessed after deletion.