---

yaml
---
r: 340954
b: refs/heads/rxwei-patch-1
c: 06a93b8
h: refs/heads/master

Author: dan-zheng

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 85255eb6ae9e439747954a4d0978b60ac5ecd3ca
+refs/heads/rxwei-patch-1: 06a93b8e8ce41d162fe12b67c3bed55b1a058c50
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/SILOptimizer/Mandatory/Differentiation.cpp

@@ -3828,6 +3828,12 @@ class AdjointEmitter final : public SILInstructionVisitor<AdjointEmitter> {
         type.getCategory());
   }
 
+  /// Substitutes all replacement types of the given substitution map using the
+  /// adjoint function's substitution map.
+  SubstitutionMap remapSubstitutionMap(SubstitutionMap substMap) {
+    return substMap.subst(getAdjoint().getForwardingSubstitutionMap());
+  }
+
   //--------------------------------------------------------------------------//
   // Managed value mapping
   //--------------------------------------------------------------------------//
@@ -4654,7 +4660,8 @@ class AdjointEmitter final : public SILInstructionVisitor<AdjointEmitter> {
           pullbackType, *applyInfo.originalPullbackType);
       auto *thunkRef = builder.createFunctionRef(loc, thunk);
       pullback = builder.createPartialApply(
-          loc, thunkRef, thunk->getForwardingSubstitutionMap(),
+          loc, thunkRef,
+          remapSubstitutionMap(thunk->getForwardingSubstitutionMap()),
           {pullback}, pullbackType->getCalleeConvention());
     }
     args.push_back(seed);

branches/rxwei-patch-1/test/AutoDiff/autodiff_diagnostics.swift

@@ -170,23 +170,6 @@ struct TF_305 : Differentiable {
   }
 }
 
-protocol TF_534_Layer : Differentiable {
-  associatedtype Input : Differentiable
-  associatedtype Output : Differentiable
-
-  @differentiable
-  func callAsFunction(_ input: Input) -> Output
-}
-struct TF_534_Tensor<Scalar> : Differentiable {}
-
-func TF_534<Model: TF_534_Layer>(
-  _ model: inout Model, inputs: Model.Input
-) -> TF_534_Tensor<Float> where Model.Output == TF_534_Tensor<Float> {
-  return valueWithPullback(at: model) { model -> Model.Output in
-    return model(inputs)
-  }.0
-}
-
 //===----------------------------------------------------------------------===//
 // Classes and existentials (not yet supported)
 //===----------------------------------------------------------------------===//

branches/rxwei-patch-1/test/AutoDiff/generics.swift

@@ -151,4 +151,22 @@ func TF_523_f(_ x: TF_523_Struct) -> Float {
   return x.a * 2
 }
 
+// TF_534: Thunk substitution map remapping.
+protocol TF_534_Layer : Differentiable {
+  associatedtype Input : Differentiable
+  associatedtype Output : Differentiable
+
+  @differentiable
+  func callAsFunction(_ input: Input) -> Output
+}
+struct TF_534_Tensor<Scalar> : Differentiable {}
+
+func TF_534<Model: TF_534_Layer>(
+  _ model: inout Model, inputs: Model.Input
+) -> TF_534_Tensor<Float> where Model.Output == TF_534_Tensor<Float> {
+  return valueWithPullback(at: model) { model -> Model.Output in
+    return model(inputs)
+  }.0
+}
+
 // TODO: add more tests.