---

yaml
---
r: 311279
b: refs/heads/tensorflow-merge
c: ff64467
h: refs/heads/master
i:
  311277: dfece55
  311275: e04d227
  311271: 6a1d9ab
  311263: b5a60c1

Author: dan-zheng

[refs]

@@ -1379,7 +1379,7 @@ refs/heads/chase-my-tail: 8bb91443a9e81bbfac92a2621a0af887a1da8dbf
 refs/heads/consider-outer-alternatives: 708bac749ec60a22a79e2eefbe734f9488a7370d
 refs/heads/revert-25740-oops-i-linked-it-again: fdd41aeb682fc488572bdc1cf71b2ff6997ba576
 refs/heads/swift-5.1-branch-06-12-2019: e63b7b2d3b93c48232d386099d0ec525d21d8f8d
-refs/heads/tensorflow-merge: ff5d85131cca828c807dc7d95f8301140e6d679a
+refs/heads/tensorflow-merge: ff644675ddbbf2c48bbb5ca8aaa771a62549c072
 refs/heads/update-checkout-sha-info: 5832743c5c2a842976c42a508a4c6dcceefb0aef
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-12-a: 228f0448d9bb909aacbba4afcb7c600a405d15da
 refs/tags/swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-14-a: 922861a77b5fc2bf46bc917da70ceb15eef76836

branches/tensorflow-merge/include/swift/AST/DiagnosticsParse.def

@@ -1454,13 +1454,7 @@ ERROR(attr_implements_expected_member_name,PointsToFirstBadToken,
 // SWIFT_ENABLE_TENSORFLOW
 // differentiable
 ERROR(attr_differentiable_expected_function_name,PointsToFirstBadToken,
-      "expected a qualified function to differentiate", ())
-
-ERROR(attr_differentiable_missing_lsquare,PointsToFirstBadToken,
-      "missing '[' for parameter index list", ())
-
-ERROR(attr_differentiable_missing_rsquare,PointsToFirstBadToken,
-      "missing ']' for parameter index list", ())
+      "expected a qualified %0 function", (StringRef))
 
 ERROR(attr_differentiable_expected_parameter_list,PointsToFirstBadToken,
       "expected a list of parameters to differentiate with respect to, e.g. (.0, w, b)", ())

branches/tensorflow-merge/include/swift/AST/DiagnosticsSema.def

@@ -2486,6 +2486,8 @@ ERROR(implements_attr_protocol_not_conformed_to,none,
 // SWIFT_ENABLE_TENSORFLOW
 ERROR(differentiable_attr_no_parameters,none,
       "%0 has no parameters to differentiate with respect to", (DeclName))
+ERROR(differentiable_attr_void_result,none,
+      "cannot differentiate void function %0", (DeclName))
 ERROR(differentiable_attr_primal_overload_not_found,none,
       "%0 does not have expected parameters' type %1", (DeclName, Type))
 ERROR(differentiable_attr_adjoint_overload_not_found,none,
@@ -2504,13 +2506,17 @@ ERROR(differentiable_attr_cannot_diff_wrt_objects_or_existentials,none,
 ERROR(differentiable_attr_function_not_same_type_context,none,
       "%0 is not defined in the current type context", (DeclName))
 ERROR(differentiable_attr_specified_not_function,none,
-      "%0 is not a function to be used as %select{primal|adjoint}1",
+      "%0 is not a function to be used as %select{adjoint|primal}1",
       (DeclName, bool))
 ERROR(differentiable_attr_ambiguous_function_identifier,none,
       "ambiguous or overloaded identifier %0 cannot be used in @differentiable "
       "attribute", (DeclName))
 ERROR(differentiable_attr_forward_mode_unsupported,none,
       "forward-mode automatic differentiation is not supported yet", ())
+ERROR(differentiable_attr_invalid_access,none,
+      "%select{adjoint|primal}2 %0 is required to either be public or "
+      "@usableFromInline because the original function %1 is public or "
+      "@usableFromInline", (DeclName, DeclName, bool))
 
 ERROR(compiler_evaluable_bad_context,none,
       "@compilerEvaluable functions not allowed here", ())

branches/tensorflow-merge/lib/Parse/ParseDecl.cpp

@@ -875,12 +875,13 @@ Parser::parseDifferentiableAttribute(SourceLoc atLoc, SourceLoc loc) {
         parseToken(tok::colon,
           diag::attr_differentiable_expected_colon_after_label, label))
       return true;
-    // Parse the name of the adjoint function.
+    // Parse the name of the function.
+    Diagnostic funcDiag(diag::attr_differentiable_expected_function_name.ID,
+                        { label });
     result.Name =
       parseUnqualifiedDeclName(/*afterDot=*/false, result.Loc,
-                              diag::attr_implements_expected_member_name,
-                              /*allowOperators=*/true,
-                              /*allowZeroArgCompoundNames=*/true);
+                               funcDiag, /*allowOperators=*/true,
+                               /*allowZeroArgCompoundNames=*/true);
     return !result.Name;
   };