---

yaml
---
r: 277435
b: refs/heads/tensorflow-merge
c: ee1742e
h: refs/heads/master
i:
  277433: fa337a8
  277431: ed9605f

Author: dan-zheng

[refs]

@@ -1124,7 +1124,7 @@ refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a: 1b087071edaea398480fb778e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-30-a: 8bc9e108e1480d9217299984e428c601c7aaac75
 refs/tags/swift-4.2.1-RELEASE: 02a6ca969ea1387475b6caeb69c31186df7d30b6
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-11-01-a: 3b0299288f8287094b9ef587f46df54f42a347af
-refs/heads/tensorflow-merge: 3fd7afd6279c5b11b1faa33ca42adb58d2b09463
+refs/heads/tensorflow-merge: ee1742e556e5e7835562a307220477561eefb659
 refs/heads/TensorFlowLite: b91446471276e37bbfe64767c875f3c7f7102954
 refs/heads/ad-side-effects: 19e0c0de1f59b0929c381925df2e8c72cdf4a728
 refs/heads/add-test-for-asan-compiler-crash: 3cdeecffb47bf28707b299fa2b5bdf0769a4a826

branches/tensorflow-merge/lib/SIL/SILFunctionType.cpp

@@ -255,14 +255,29 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
                             ArrayRef<SILResultInfo> newResults,
                             GenericSignature *genericSignature)
       -> CanSILFunctionType {
-    return SILFunctionType::get(genericSignature
-                                  ? genericSignature
-                                  : base->getGenericSignature(),
+    if (!genericSignature)
+      genericSignature = base->getGenericSignature();
+    // If generic signature is specified, use it to canonical result types.
+    // This is important for consistent typing for types like:
+    //     <T : Differentiable, T == T.CotangentVector> (...) ->
+    //         (@out T.CotangentVector)
+    // Which should be canonicalized to:
+    //     <T : Differentiable, T == T.CotangentVector> (...) ->
+    //         (@out T)
+    ArrayRef<SILResultInfo> results =
+        genericSignature
+            ? map<SmallVector<SILResultInfo, 4>>(
+                  newResults, [&](SILResultInfo resInfo) {
+                    return resInfo.getWithType(
+                        resInfo.getType()->getCanonicalType(genericSignature));
+                  })
+            : newResults;
+    return SILFunctionType::get(genericSignature,
                                 base->getExtInfo(),
                                 base->getCoroutineKind(),
                                 base->getCalleeConvention(),
                                 base->getParameters(), base->getYields(),
-                                newResults, base->getOptionalErrorResult(), ctx,
+                                results, base->getOptionalErrorResult(), ctx,
                                 base->getWitnessMethodConformanceOrNone());
   };
 
@@ -328,17 +343,14 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
   results.push_back({closureType, ResultConvention::Owned});
   CanSILFunctionType associatedFunction =
       withNewResults(curryLevels.back(), results,
-                     curryLevels.size() == 1 ? whereClauseGenSig : nullptr);
+                     whereClauseGenSig);
 
   auto curryLevelsWithoutLast =
       ArrayRef<SILFunctionType *>(curryLevels).drop_back(1);
-  for (auto pair : enumerate(reversed(curryLevelsWithoutLast))) {
-    unsigned i = pair.index();
-    auto *curryLevel = pair.value();
+  for (auto *curryLevel : reversed(curryLevelsWithoutLast))
     associatedFunction = withNewResults(
         curryLevel, {{associatedFunction, ResultConvention::Owned}},
-        i == curryLevelsWithoutLast.size() - 1 ? whereClauseGenSig : nullptr);
-  }
+        whereClauseGenSig);
   return associatedFunction;
 }