---

yaml
---
r: 262063
b: refs/heads/tensorflow
c: 033f09a
h: refs/heads/master
i:
  262061: e0f10e2
  262059: f11ba92
  262055: c7389ef
  262047: 2bceee3

Author: marcrasi

[refs]

@@ -818,7 +818,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 29fad40e136aa6dc397eb5e40d3d6d5750832946
+refs/heads/tensorflow: 033f09a974ec0c247eb76e8fa2399fd321c0a350
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/lib/SIL/SILFunctionType.cpp

@@ -219,6 +219,11 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
   // VJP: (T...) -> ((R...),
   //                 (R.CotangentVector...) -> (T.CotangentVector...))
 
+  // RAII that pushes our generic context to `module.Types` so that the calls
+  // `module.Types.getTypeLowering()` below can understand our generic
+  // parameter types.
+  GenericContextScope genericContextScope(module.Types, getGenericSignature());
+
   auto &ctx = getASTContext();
 
   unsigned numParamsWithoutSelf = hasSelfParam() ? getNumParameters() - 1
@@ -263,24 +268,24 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
   };
 
   // Given a type, returns its formal SIL parameter info.
-  auto getFormalParameterInfo = [&module](CanType type) -> SILParameterInfo {
-    SILType silTy = SILType::getPrimitiveObjectType(type);
+  auto getFormalParameterInfo = [&](CanType type) -> SILParameterInfo {
+    auto &typeLowering = module.Types.getTypeLowering(type);
     ParameterConvention conv;
-    if (SILModuleConventions::isPassedIndirectlyInSIL(silTy, module))
+    if (typeLowering.isFormallyPassedIndirectly())
       conv = ParameterConvention::Indirect_In_Guaranteed;
-    else if (silTy.isTrivial(module))
+    else if (typeLowering.isTrivial())
       conv = ParameterConvention::Direct_Unowned;
     else
       conv = ParameterConvention::Direct_Guaranteed;
     return {type, conv};
   };
   // Given a type, returns its formal SIL result info.
-  auto getFormalResultInfo = [&module](CanType type) -> SILResultInfo {
-    SILType silTy = SILType::getPrimitiveObjectType(type);
+  auto getFormalResultInfo = [&](CanType type) -> SILResultInfo {
+    auto &typeLowering = module.Types.getTypeLowering(type);
     ResultConvention conv;
-    if (SILModuleConventions::isPassedIndirectlyInSIL(silTy, module))
+    if (typeLowering.isFormallyReturnedIndirectly())
       conv = ResultConvention::Indirect;
-    else if (silTy.isTrivial(module))
+    else if (typeLowering.isTrivial())
       conv = ResultConvention::Unowned;
     else
       conv = ResultConvention::Owned;
@@ -312,7 +317,7 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
       result.getConvention()
     });
     auto differentialType = SILFunctionType::get(
-        getGenericSignature(), ExtInfo(), SILCoroutineKind::None,
+        /*genericSignature*/ nullptr, ExtInfo(), SILCoroutineKind::None,
         ParameterConvention::Direct_Guaranteed, tangentParams, {},
         tangentResults, None, ctx);
     SmallVector<SILResultInfo, 8> jvpResults(getResults().begin(),
@@ -343,7 +348,7 @@ CanSILFunctionType SILFunctionType::getAutoDiffAssociatedFunctionType(
               getAssociatedType(param.getType(), cotangentDependentType)));
     }
     auto pullbackType = SILFunctionType::get(
-        getGenericSignature(), ExtInfo(), SILCoroutineKind::None,
+        /*genericSignature*/ nullptr, ExtInfo(), SILCoroutineKind::None,
         ParameterConvention::Direct_Guaranteed, cotangentParams, {},
         cotangentResults, {}, ctx);
     SmallVector<SILResultInfo, 8> vjpResults(getResults().begin(),