Merge pull request #30873 from dan-zheng/autodiff-sil

[AutoDiff] Minor SILOptimizer changes.

Author: dan-zheng

include/swift/SILOptimizer/Utils/Differentiation/AdjointValue.h

@@ -148,7 +148,7 @@ class AdjointValue final {
               std::get<1>(elt).print(s);
             },
             [&s] { s << ", "; });
-      } else if (auto tupleType = getType().getAs<TupleType>()) {
+      } else if (getType().is<TupleType>()) {
         s << "Tuple>(";
         interleave(
             base->value.aggregate,

lib/SILOptimizer/Utils/Differentiation/LinearMapInfo.cpp

@@ -122,9 +122,11 @@ LinearMapInfo::createBranchingTraceDecl(SILBasicBlock *originalBB,
   auto &file = getSynthesizedFile();
   // Create a branching trace enum.
   Mangle::ASTMangler mangler;
+  auto originalFnTy = original->getLoweredFunctionType();
+  auto numResults = originalFnTy->getNumResults() +
+                    originalFnTy->getNumIndirectMutatingParameters();
   auto *resultIndices = IndexSubset::get(
-      original->getASTContext(),
-      original->getLoweredFunctionType()->getNumResults(), indices.source);
+      original->getASTContext(), numResults, indices.source);
   auto *parameterIndices = indices.parameters;
   AutoDiffConfig config(parameterIndices, resultIndices, genericSig);
   auto enumName = mangler.mangleAutoDiffGeneratedDeclaration(
@@ -193,9 +195,11 @@ LinearMapInfo::createLinearMapStruct(SILBasicBlock *originalBB,
   auto &file = getSynthesizedFile();
   // Create a linear map struct.
   Mangle::ASTMangler mangler;
+  auto originalFnTy = original->getLoweredFunctionType();
+  auto numResults = originalFnTy->getNumResults() +
+                    originalFnTy->getNumIndirectMutatingParameters();
   auto *resultIndices = IndexSubset::get(
-      original->getASTContext(),
-      original->getLoweredFunctionType()->getNumResults(), indices.source);
+      original->getASTContext(), numResults, indices.source);
   auto *parameterIndices = indices.parameters;
   AutoDiffConfig config(parameterIndices, resultIndices, genericSig);
   auto structName = mangler.mangleAutoDiffGeneratedDeclaration(

lib/SILOptimizer/Utils/Differentiation/PullbackEmitter.cpp

@@ -1676,14 +1676,14 @@ void PullbackEmitter::visitBeginBorrowInst(BeginBorrowInst *bbi) {
 void PullbackEmitter::visitBeginAccessInst(BeginAccessInst *bai) {
   // Check for non-differentiable writes.
   if (bai->getAccessKind() == SILAccessKind::Modify) {
-    if (auto *gai = dyn_cast<GlobalAddrInst>(bai->getSource())) {
+    if (isa<GlobalAddrInst>(bai->getSource())) {
       getContext().emitNondifferentiabilityError(
           bai, getInvoker(),
           diag::autodiff_cannot_differentiate_writes_to_global_variables);
       errorOccurred = true;
       return;
     }
-    if (auto *pbi = dyn_cast<ProjectBoxInst>(bai->getSource())) {
+    if (isa<ProjectBoxInst>(bai->getSource())) {
       getContext().emitNondifferentiabilityError(
           bai, getInvoker(),
           diag::autodiff_cannot_differentiate_writes_to_mutable_captures);
@@ -1904,7 +1904,7 @@ AdjointValue PullbackEmitter::accumulateAdjointsDirect(AdjointValue lhs,
       SmallVector<AdjointValue, 8> newElements;
       auto lhsTy = lhsVal->getType().getASTType();
       auto lhsValCopy = builder.emitCopyValueOperation(loc, lhsVal);
-      if (auto *tupTy = lhsTy->getAs<TupleType>()) {
+      if (lhsTy->is<TupleType>()) {
         auto elts = builder.createDestructureTuple(loc, lhsValCopy);
         llvm::for_each(elts->getResults(),
                        [this](SILValue result) { recordTemporary(result); });
@@ -1913,7 +1913,7 @@ AdjointValue PullbackEmitter::accumulateAdjointsDirect(AdjointValue lhs,
           newElements.push_back(accumulateAdjointsDirect(
               makeConcreteAdjointValue(elts->getResult(i)), rhsElt, loc));
         }
-      } else if (auto *structDecl = lhsTy->getStructOrBoundGenericStruct()) {
+      } else if (lhsTy->getStructOrBoundGenericStruct()) {
         auto elts =
             builder.createDestructureStruct(lhsVal.getLoc(), lhsValCopy);
         llvm::for_each(elts->getResults(),