---

yaml
---
r: 341630
b: refs/heads/rxwei-patch-1
c: 427b19b
h: refs/heads/master

Author: rxwei

[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: c9df276084b07cf70445ff2d6d6cbd2901380499
+refs/heads/rxwei-patch-1: 427b19b62dbffbde033be770ea85b3daaf8246d9
 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/SIL/SILFunctionType.cpp

@@ -231,17 +231,19 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
   case AutoDiffAssociatedFunctionKind::JVP: {
     SmallVector<SILParameterInfo, 8> differentialParams;
     for (auto &param : wrtParams) {
+      auto paramTan =
+          param.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance);
+      assert(paramTan && "Parameter type does not have a tangent space?");
       differentialParams.push_back(
-          {param.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance)
-              ->getCanonicalType(),
-           param.getConvention()});
+          {paramTan->getCanonicalType(), param.getConvention()});
     }
     SmallVector<SILResultInfo, 8> differentialResults;
     auto &result = getResults()[resultIndex];
+    auto resultTan =
+        result.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance);
+    assert(resultTan && "Result type does not have a tangent space?");
     differentialResults.push_back(
-        {result.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance)
-            ->getCanonicalType(),
-         result.getConvention()});
+        {resultTan->getCanonicalType(), result.getConvention()});
     closureType = SILFunctionType::get(
         /*genericSignature*/ nullptr, ExtInfo(), SILCoroutineKind::None,
         ParameterConvention::Direct_Guaranteed, differentialParams, {},
@@ -251,19 +253,19 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
   case AutoDiffAssociatedFunctionKind::VJP: {
     SmallVector<SILParameterInfo, 8> pullbackParams;
     auto &origRes = getResults()[resultIndex];
-    auto tangentAssocTy =
-        origRes.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance)
-            ->getCanonicalType();
+    auto resultTan =
+        origRes.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance);
+    assert(resultTan && "Result type does not have a tangent space?");
     pullbackParams.push_back(
-        getTangentParameterInfoForOriginalResult(tangentAssocTy,
+        getTangentParameterInfoForOriginalResult(resultTan->getCanonicalType(),
                                                  origRes.getConvention()));
     SmallVector<SILResultInfo, 8> pullbackResults;
     for (auto &param : wrtParams) {
-      auto paramTangentTy =
-          param.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance)
-              ->getCanonicalType();
+      auto paramTan =
+          param.getType()->getAutoDiffAssociatedTangentSpace(lookupConformance);
+      assert(paramTan && "Parameter type does not have a tangent space?");
       pullbackResults.push_back(
-          getTangentResultInfoForOriginalParameter(paramTangentTy,
+          getTangentResultInfoForOriginalParameter(paramTan->getCanonicalType(),
                                                    param.getConvention()));
     }
     closureType = SILFunctionType::get(