---

yaml
---
r: 340985
b: refs/heads/rxwei-patch-1
c: a02e81e
h: refs/heads/master
i:
  340983: e2365fb

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: a5bff23519ae4e35498cddba3d3a02fb26d5b157
+refs/heads/rxwei-patch-1: a02e81e63f31a002e733cc5384550e319d059889
 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/SILVerifier.cpp

@@ -1491,7 +1491,9 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
             adfi->getParameterIndices(), /*resultIndex*/ 0, order,
             AutoDiffAssociatedFunctionKind::JVP, F.getModule(),
             LookUpConformanceInModule(F.getModule().getSwiftModule()));
-        require(expectedJVPType == jvpType, "Unexpected JVP function type");
+        requireSameType(SILType::getPrimitiveObjectType(jvpType),
+                        SILType::getPrimitiveObjectType(expectedJVPType),
+                        "JVP type does not match expected JVP type");
         auto vjpType = pair.second->getType().getAs<SILFunctionType>();
         require(vjpType, "The VJP function must have a function type");
         require(!vjpType->isDifferentiable(),
@@ -1500,7 +1502,9 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
             adfi->getParameterIndices(), /*resultIndex*/ 0, order,
             AutoDiffAssociatedFunctionKind::VJP, F.getModule(),
             LookUpConformanceInModule(F.getModule().getSwiftModule()));
-        require(expectedVJPType == vjpType, "Unexpected VJP function type");
+        requireSameType(SILType::getPrimitiveObjectType(vjpType),
+                        SILType::getPrimitiveObjectType(expectedVJPType),
+                        "VJP type does not match expected VJP type");
       }
     }
   }