---

yaml
---
r: 277437
b: refs/heads/tensorflow-merge
c: 9511f40
h: refs/heads/master
i:
  277435: 080c4f2

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: a3cb68e3a2f90cb1b04e988d1d1d1ef442eb1371
+refs/heads/tensorflow-merge: 9511f404ceae43fdaa91263a396716a22b17f9e0
 refs/heads/TensorFlowLite: b91446471276e37bbfe64767c875f3c7f7102954
 refs/heads/ad-side-effects: 19e0c0de1f59b0929c381925df2e8c72cdf4a728
 refs/heads/add-test-for-asan-compiler-crash: 3cdeecffb47bf28707b299fa2b5bdf0769a4a826

branches/tensorflow-merge/lib/SILOptimizer/Mandatory/Differentiation.cpp

@@ -4604,7 +4604,7 @@ void AdjointEmitter::materializeAdjointIndirectHelper(
 
 void AdjointEmitter::emitZeroIndirect(CanType type, SILValue bufferAccess,
                                       SILLocation loc) {
-  // Lookup `AdditiveArithmetic.zero.getter`.
+  // Look up `AdditiveArithmetic.zero.getter`.
   auto *additiveArithmeticProto =
       getASTContext().getProtocol(KnownProtocolKind::AdditiveArithmetic);
   auto initDeclLookup =
@@ -4615,20 +4615,21 @@ void AdjointEmitter::emitZeroIndirect(CanType type, SILValue bufferAccess,
   SILDeclRef accessorDeclRef(accessorDecl, SILDeclRef::Kind::Func);
   auto methodType =
       getContext().getTypeConverter().getConstantType(accessorDeclRef);
-  // Lookup conformance to `AdditiveArithmetic`.
+  // Look up conformance to `AdditiveArithmetic`.
   auto *swiftMod = getModule().getSwiftModule();
-  auto conf = swiftMod->lookupConformance(type, additiveArithmeticProto);
-  assert(conf.hasValue() && "No conformance to AdditiveArithmetic?");
-  ProtocolConformanceRef confRef(*conf);
+  auto confRef = swiftMod->lookupConformance(type, additiveArithmeticProto);
+  // TODO(TF-202): Diagnose no `AdditiveArithmetic` due to generic signature
+  // minimization bug.
+  assert(confRef.hasValue() && "Missing conformance to `AdditiveArithmetic`");
   // %wm = witness_method ...
-  auto *getter = builder.createWitnessMethod(loc, type, confRef,
+  auto *getter = builder.createWitnessMethod(loc, type, *confRef,
                                              accessorDeclRef, methodType);
   // %metatype = metatype $T
   auto metatypeType = CanMetatypeType::get(type, MetatypeRepresentation::Thick);
   auto metatype = builder.createMetatype(
       loc, SILType::getPrimitiveObjectType(metatypeType));
   auto subMap = SubstitutionMap::getProtocolSubstitutions(
-      additiveArithmeticProto, type, confRef);
+      additiveArithmeticProto, type, *confRef);
   builder.createApply(loc, getter, subMap, {bufferAccess, metatype},
                       /*isNonThrowing*/ false);
 }
@@ -4838,14 +4839,18 @@ void AdjointEmitter::accumulateIndirect(
     auto adjointParentModule = cotangentSpace->getNominal()
         ? cotangentSpace->getNominal()->getModuleContext()
         : getModule().getSwiftModule();
-    auto confRef = *adjointParentModule->lookupConformance(adjointASTTy, proto);
+    auto confRef = adjointParentModule->lookupConformance(adjointASTTy, proto);
+    // TODO(TF-202): Diagnose no `AdditiveArithmetic` due to generic signature
+    // minimization bug.
+    assert(confRef.hasValue() && "Missing conformance to `AdditiveArithmetic`");
     SILDeclRef declRef(combinerFuncDecl, SILDeclRef::Kind::Func);
     auto silFnTy = getContext().getTypeConverter().getConstantType(declRef);
     // %0 = witness_method @+
     auto witnessMethod = builder.createWitnessMethod(loc, adjointASTTy,
-                                                     confRef, declRef, silFnTy);
-    auto subMap =
-        SubstitutionMap::getProtocolSubstitutions(proto, adjointASTTy, confRef);
+                                                     *confRef, declRef,
+                                                     silFnTy);
+    auto subMap = SubstitutionMap::getProtocolSubstitutions(
+        proto, adjointASTTy, *confRef);
     // %1 = metatype $T.Type
     auto metatypeType =
         CanMetatypeType::get(adjointASTTy, MetatypeRepresentation::Thick);
@@ -4891,14 +4896,15 @@ void AdjointEmitter::accumulateIndirect(SILValue lhsDestAccess,
     auto *proto = getContext().getAdditiveArithmeticProtocol();
     auto *accumulatorFuncDecl = getContext().getPlusEqualDecl();
     // Call the combiner function and return.
-    auto confRef = *swiftMod->lookupConformance(astType, proto);
+    auto confRef = swiftMod->lookupConformance(astType, proto);
+    assert(confRef.hasValue() && "Missing conformance to `AdditiveArithmetic`");
     SILDeclRef declRef(accumulatorFuncDecl, SILDeclRef::Kind::Func);
     auto silFnTy = getContext().getTypeConverter().getConstantType(declRef);
     // %0 = witness_method @+=
     auto witnessMethod =
-        builder.createWitnessMethod(loc, astType, confRef, declRef, silFnTy);
+        builder.createWitnessMethod(loc, astType, *confRef, declRef, silFnTy);
     auto subMap =
-        SubstitutionMap::getProtocolSubstitutions(proto, astType, confRef);
+        SubstitutionMap::getProtocolSubstitutions(proto, astType, *confRef);
     // %1 = metatype $T.Type
     auto metatypeType =
         CanMetatypeType::get(astType, MetatypeRepresentation::Thick);