---

yaml
---
r: 340733
b: refs/heads/rxwei-patch-1
c: d545974
h: refs/heads/master
i:
  340731: 13bb6bf

Author: Eugene Burmako

[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: fb402ef7bb95edd7b4ea0720210ccba39d3801dc
+refs/heads/rxwei-patch-1: d5459740c357342008c12a9c086cab853714af0d
 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/include/swift/AST/Attr.def

@@ -428,10 +428,10 @@ DECL_ATTR(differentiating, Differentiating,
   OnFunc | LongAttribute | AllowMultipleAttributes |
   NotSerialized, 90)
 SIMPLE_DECL_ATTR(compilerEvaluable, CompilerEvaluable,
-                 OnAccessor | OnFunc | OnConstructor | OnSubscript,
-                 /* Not serialized */ 91)
+  OnAccessor | OnFunc | OnConstructor | OnSubscript,
+  /* Not serialized */ 91)
 SIMPLE_DECL_ATTR(noDerivative, NoDerivative,
-                 OnVar, 92)
+  OnVar, 92)
 
 #undef TYPE_ATTR
 #undef DECL_ATTR_ALIAS

branches/rxwei-patch-1/include/swift/AST/AutoDiff.h

@@ -32,26 +32,36 @@ enum class DifferentiabilityKind: uint8_t {
 
 class ParsedAutoDiffParameter {
 public:
-  enum class Kind { Named, Self };
+  enum class Kind { Named, Ordered, Self };
 
 private:
   SourceLoc Loc;
   Kind Kind;
   union Value {
-    struct { Identifier Name; }; // Index
+    struct { Identifier Name; }; // Named
+    struct { unsigned Index; }; // Ordered
     struct {};                  // Self
     Value(Identifier name) : Name(name) {}
+    Value(unsigned index) : Index(index) {}
     Value() {}
   } V;
 
 public:
   ParsedAutoDiffParameter(SourceLoc loc, enum Kind kind, Value value)
     : Loc(loc), Kind(kind), V(value) {}
+  
+  ParsedAutoDiffParameter(SourceLoc loc, enum Kind kind, unsigned index)
+  : Loc(loc), Kind(kind), V(index) {}
 
   static ParsedAutoDiffParameter getNamedParameter(SourceLoc loc,
                                                    Identifier name) {
     return { loc, Kind::Named, name };
   }
+  
+  static ParsedAutoDiffParameter getOrderedParameter(SourceLoc loc,
+                                                     unsigned index) {
+    return { loc, Kind::Ordered, index };
+  }
 
   static ParsedAutoDiffParameter getSelfParameter(SourceLoc loc) {
     return { loc, Kind::Self, {} };
@@ -61,6 +71,10 @@ class ParsedAutoDiffParameter {
     assert(Kind == Kind::Named);
     return V.Name;
   }
+  
+  unsigned getIndex() const {
+    return V.Index;
+  }
 
   enum Kind getKind() const {
     return Kind;

branches/rxwei-patch-1/include/swift/AST/DiagnosticsParse.def

@@ -1516,7 +1516,8 @@ ERROR(attr_differentiating_expected_label_linear_or_wrt,none,
 ERROR(expected_colon_after_label,PointsToFirstBadToken,
       "expected a colon ':' after '%0'", (StringRef))
 ERROR(diff_params_clause_expected_parameter,PointsToFirstBadToken,
-      "expected a parameter, which can be a function parameter name or 'self'",
+      "expected a parameter, which can be a function parameter name, "
+      "parameter index, or 'self'",
       ())
 
 // [differentiable ...] (sil-decl attr)

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSIL.def

@@ -413,16 +413,16 @@ NOTE(autodiff_external_nondifferentiable_function,none,
      "'@differentiable' and that are defined in other files", ())
 NOTE(autodiff_nondifferentiable_argument,none,
      "cannot differentiate through a non-differentiable argument; do you want "
-     "to add '.withoutDerivative()'?", ())
+     "to use 'withoutDerivative(at:)'?", ())
 NOTE(autodiff_nondifferentiable_result,none,
      "cannot differentiate through a non-differentiable result; do you want to "
-     "add '.withoutDerivative()'?", ())
+     "use 'withoutDerivative(at:)'?", ())
 NOTE(autodiff_noderivative_stored_property,none,
      "cannot differentiate through a '@noDerivative' stored property; do you "
-     "want to add '.withoutDerivative()'?", ())
+     "want to use 'withoutDerivative(at:)'?", ())
 WARNING(autodiff_nonvaried_result_fixit,none,
         "result does not depend on differentiation arguments and will always "
-        "have a zero derivative; do you want to add '.withoutDerivative()'?",
+        "have a zero derivative; do you want to use 'withoutDerivative(at:)'?",
         ())
 NOTE(autodiff_enums_unsupported,none,
      "differentiating enum values is not yet supported", ())

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSema.def

@@ -1100,10 +1100,6 @@ NOTE(string_index_not_integer_note,none,
      "consider using an existing high level algorithm, "
      "str.startIndex.advanced(by: n), or a projection like str.utf8", ())
 
-// SWIFT_ENABLE_TENSORFLOW
-ERROR(invalid_tensorflow_fn_conversion,none,
-      "TensorFlow functions cannot be converted to other function types", ())
-
 
 ERROR(invalid_c_function_pointer_conversion_expr,none,
       "a C function pointer can only be formed from a reference to a 'func' or "
@@ -1118,6 +1114,12 @@ ERROR(c_function_pointer_from_function_with_context,none,
       "%select{local function|closure}0 that captures "
       "%select{context|generic parameters|dynamic Self type|<<error>}1",
       (bool, unsigned))
+// SWIFT_ENABLE_TENSORFLOW
+ERROR(invalid_differentiable_function_conversion_expr,none,
+      "a '@differentiable' function can only be formed from a reference to a "
+      "'func' or a literal closure", ())
+NOTE(invalid_differentiable_function_conversion_parameter,none,
+     "did you mean to take a '%0' closure?", (StringRef))
 ERROR(invalid_autoclosure_forwarding,none,
       "add () to forward @autoclosure parameter", ())
 
@@ -2815,7 +2817,9 @@ ERROR(diff_params_clause_self_instance_method_only,none,
 ERROR(diff_params_clause_self_must_be_first,none,
       "'self' parameter must come first in the parameter list", ())
 ERROR(diff_params_clause_params_not_original_order,none,
-      "parameter names must be specified in original order", ())
+      "parameters must be specified in original order", ())
+ERROR(diff_params_clause_param_index_out_of_range,none,
+      "parameter index is larger than total number of parameters", ())
 ERROR(diff_params_clause_no_inferred_parameters,PointsToFirstBadToken,
       "no differentiation parameters could be inferred; must differentiate "
       "with respect to at least one parameter conforming to 'Differentiable'",

branches/rxwei-patch-1/include/swift/Parse/Parser.h

@@ -961,7 +961,6 @@ class Parser {
   bool parseDifferentiationParametersClause(
       SmallVectorImpl<ParsedAutoDiffParameter> &params, StringRef attrName);
 
-  /// SWIFT_ENABLE_TENSORFLOW
   /// Parse the @differentiating attribute.
   ParserResult<DifferentiatingAttr>
   parseDifferentiatingAttribute(SourceLoc AtLoc, SourceLoc Loc);

branches/rxwei-patch-1/lib/AST/Attr.cpp

@@ -374,6 +374,13 @@ static std::string getDifferentiationParametersClauseString(
       case ParsedAutoDiffParameter::Kind::Self:
         printer << "self";
         break;
+      case ParsedAutoDiffParameter::Kind::Ordered:
+        auto *paramList = function->getParameters();
+        assert(param.getIndex() <= paramList->size() &&
+               "wrt parameter is out of range");
+        auto *funcParam = paramList->get(param.getIndex());
+        printer << funcParam->getNameStr();
+        break;
       }
     }, [&] { printer << ", "; });
     if (parsedParams.size() > 1)

branches/rxwei-patch-1/lib/IRGen/GenDecl.cpp

@@ -1654,16 +1654,13 @@ getIRLinkage(const UniversalLinkageInfo &info, SILLinkage linkage,
     return {llvm::GlobalValue::ExternalLinkage, PublicDefinitionVisibility,
             ExportedStorage};
 
-  case SILLinkage::PublicNonABI:
-    return isDefinition ? RESULT(WeakODR, Hidden, Default)
-                        : RESULT(External, Hidden, Default);
-
   case SILLinkage::Shared:
   case SILLinkage::SharedExternal:
     return isDefinition ? RESULT(LinkOnceODR, Hidden, Default)
                         : RESULT(External, Hidden, Default);
 
   case SILLinkage::Hidden:
+  case SILLinkage::PublicNonABI:
     return RESULT(External, Hidden, Default);
 
   case SILLinkage::Private: {

branches/rxwei-patch-1/lib/IRGen/GenFunc.cpp

@@ -1247,22 +1247,8 @@ static llvm::Function *emitPartialApplicationForwarder(IRGenModule &IGM,
     // cast to the result type - it could be substituted.
     if (origConv.getSILResultType().hasTypeParameter()) {
       auto ResType = fwd->getReturnType();
-      // SWIFT_ENABLE_TENSORFLOW
-      if (auto *structType = dyn_cast<llvm::StructType>(ResType)) {
-        // Cast all struct elements to the desired type.
-        llvm::Value *castResult = llvm::UndefValue::get(structType);
-        for (auto i : range(structType->getStructNumElements())) {
-          auto desiredEltTy = structType->getElementType(i);
-          auto elt = subIGF.Builder.CreateExtractValue(callResult, {i});
-          auto castElt = subIGF.Builder.CreateBitCast(elt, desiredEltTy);
-          castResult =
-              subIGF.Builder.CreateInsertValue(castResult, castElt, {i});
-        }
-        callResult = castResult;
-      }
-      else
-        if (ResType != callResult->getType())
-          callResult = subIGF.coerceValue(callResult, ResType, subIGF.IGM.DataLayout);
+      if (ResType != callResult->getType())
+        callResult = subIGF.coerceValue(callResult, ResType, subIGF.IGM.DataLayout);
     }
     subIGF.Builder.CreateRet(callResult);
   }

branches/rxwei-patch-1/lib/Parse/ParseDecl.cpp

@@ -892,6 +892,17 @@ bool Parser::parseDifferentiationParametersClause(
             paramLoc, paramName));
         break;
       }
+      case tok::integer_literal: {
+        unsigned paramNum;
+        if (parseUnsignedInteger(
+                paramNum, paramLoc,
+                diag::diff_params_clause_expected_parameter))
+          return true;
+
+        params.push_back(ParsedAutoDiffParameter::getOrderedParameter(
+            paramLoc, paramNum));
+        break;
+      }
       case tok::kw_self: {
         paramLoc = consumeToken(tok::kw_self);
         params.push_back(ParsedAutoDiffParameter::getSelfParameter(paramLoc));
@@ -1960,15 +1971,15 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
     break;
   }
 
-  /// SWIFT_ENABLE_TENSORFLOW
+  // SWIFT_ENABLE_TENSORFLOW
   case DAK_Differentiable: {
     auto Attr = parseDifferentiableAttribute(AtLoc, Loc);
     if (Attr.isNonNull())
       Attributes.add(Attr.get());
     break;
   }
 
-  /// SWIFT_ENABLE_TENSORFLOW
+  // SWIFT_ENABLE_TENSORFLOW
   case DAK_Differentiating: {
     auto Attr = parseDifferentiatingAttribute(AtLoc, Loc);
     if (Attr.isNonNull())