Merge pull request #28924 from apple/tensorflow-merge

Merge tag 'swift-DEVELOPMENT-SNAPSHOT-2019-12-20-a' into tensorflow

Author: dan-zheng

.mailmap

@@ -8,6 +8,7 @@ Amr Aboelela <[email protected]> <[email protected]>
 Ankit Aggarwal <[email protected]> <[email protected]>
 Argyrios Kyrtzidis <[email protected]> <[email protected]>
 Arsen Gasparyan <[email protected]> <[email protected]>
+Ashley Garland <[email protected]> <[email protected]>
 Ben Cohen <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>
 Ben Cohen <[email protected]> <[email protected]>

CMakeLists.txt

@@ -970,10 +970,16 @@ if(SWIFT_BUILD_SYNTAXPARSERLIB OR SWIFT_BUILD_SOURCEKIT)
       set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})
     elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})
       if(CMAKE_SYSTEM_NAME STREQUAL Windows)
-        set(SWIFT_LIBDISPATCH_C_COMPILER
-            $<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
-        set(SWIFT_LIBDISPATCH_CXX_COMPILER
-            $<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+        if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR AND
+            TARGET clang)
+          set(SWIFT_LIBDISPATCH_C_COMPILER
+              $<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+          set(SWIFT_LIBDISPATCH_CXX_COMPILER
+              $<TARGET_FILE_DIR:clang>/clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+        else()
+          set(SWIFT_LIBDISPATCH_C_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+          set(SWIFT_LIBDISPATCH_CXX_COMPILER clang-cl${CMAKE_EXECUTABLE_SUFFIX})
+        endif()
       else()
         set(SWIFT_LIBDISPATCH_C_COMPILER $<TARGET_FILE_DIR:clang>/clang)
         set(SWIFT_LIBDISPATCH_CXX_COMPILER $<TARGET_FILE_DIR:clang>/clang++)

include/swift/AST/ASTContext.h

@@ -313,7 +313,7 @@ class ASTContext final {
   // same parameter indices but different derivative generic signatures.
   llvm::DenseMap<
       std::tuple<Decl *, IndexSubset *, AutoDiffDerivativeFunctionKind>,
-      DerivativeAttr *>
+      llvm::SmallPtrSet<DerivativeAttr *, 1>>
       DerivativeAttrs;
 
 private:

include/swift/AST/ASTScope.h

@@ -479,6 +479,10 @@ class ASTScopeImpl {
   /// asked.
   virtual Optional<NullablePtr<DeclContext>> computeSelfDCForParent() const;
 
+  /// Returns the context that should be used when a nested scope (e.g. a
+  /// closure) captures self explicitly.
+  virtual NullablePtr<DeclContext> capturedSelfDC() const;
+
 protected:
   /// Find either locals or members (no scope has both)
   /// \param history The scopes visited since the start of lookup (including
@@ -692,6 +696,15 @@ class Portion {
     /// to compute the selfDC from the history.
     static NullablePtr<DeclContext>
     computeSelfDC(ArrayRef<const ASTScopeImpl *> history);
+    
+    /// If we find a lookup result that requires the dynamic implict self value,
+    /// we need to check the nested scopes to see if any closures explicitly
+    /// captured \c self. In that case, the appropriate selfDC is that of the
+    /// innermost closure which captures a \c self value from one of this type's
+    /// methods.
+    static NullablePtr<DeclContext>
+    checkNestedScopesForSelfCapture(ArrayRef<const ASTScopeImpl *> history,
+                                    size_t start);
 };
 
 /// Behavior specific to representing the trailing where clause of a
@@ -1449,6 +1462,13 @@ class ClosureParametersScope final : public AbstractClosureScope {
   std::string getClassName() const override;
   SourceRange
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
+  
+  /// Since explicit captures of \c self by closures enable the use of implicit
+  /// \c self, we need to make sure that the appropriate \c self is used as the
+  /// base decl for these uses (otherwise, the capture would be marked as
+  /// unused. \c ClosureParametersScope::capturedSelfDC() checks if we have such
+  ///  a capture of self.
+  NullablePtr<DeclContext> capturedSelfDC() const override;
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &) override;

include/swift/AST/Attr.def

@@ -57,6 +57,7 @@ TYPE_ATTR(noDerivative)
 TYPE_ATTR(autodiff)
 TYPE_ATTR(nondiff)
 TYPE_ATTR(quoted)
+// SWIFT_ENABLE_TENSORFLOW END
 
 // SIL-specific attributes
 TYPE_ATTR(block_storage)
@@ -545,27 +546,28 @@ DECL_ATTR(_implicitly_synthesizes_nested_requirement, ImplicitlySynthesizesNeste
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
   98)
 
+DECL_ATTR(transpose, Transpose,
+  OnFunc | LongAttribute | AllowMultipleAttributes |
+  ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
+  99)
+
 // SWIFT_ENABLE_TENSORFLOW
 DECL_ATTR(quoted, Quoted,
   OnFunc |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove,
-  99)
+  100)
 // TODO(TF-999): Remove deprecated `@differentiating` attribute.
 DECL_ATTR(differentiating, Differentiating,
   OnFunc | LongAttribute | AllowMultipleAttributes |
   ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
-  100)
+  101)
 SIMPLE_DECL_ATTR(compilerEvaluable, CompilerEvaluable,
   OnAccessor | OnFunc | OnConstructor | OnSubscript |
   ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIStableToRemove |
-  NotSerialized, 101)
+  NotSerialized, 102)
 SIMPLE_DECL_ATTR(noDerivative, NoDerivative,
   OnVar |
   ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  102)
-DECL_ATTR(transpose, Transpose,
-  OnFunc | LongAttribute | AllowMultipleAttributes |
-  ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
   103)
 // SWIFT_ENABLE_TENSORFLOW END
 

include/swift/AST/Attr.h

@@ -1626,6 +1626,8 @@ class OriginallyDefinedInAttr: public DeclAttribute {
   /// Indicates when the symbol was moved here.
   const llvm::VersionTuple MovedVersion;
 
+  /// Returns true if this attribute is active given the current platform.
+  bool isActivePlatform(const ASTContext &ctx) const;
   static bool classof(const DeclAttribute *DA) {
     return DA->getKind() == DAK_OriginallyDefinedIn;
   }
@@ -1844,19 +1846,19 @@ class DifferentiableAttr final
   }
 };
 
-/// The `@derivative` attribute registers a function as a derivative of another
-/// function-like declaration: a 'func', 'init', 'subscript', or 'var' computed
-/// property declaration.
+/// The `@derivative(of:)` attribute registers a function as a derivative of
+/// another function-like declaration: a 'func', 'init', 'subscript', or 'var'
+/// computed property declaration.
 ///
-/// The `@derivative` attribute also has an optional `wrt:` clause specifying
-/// the parameters that are differentiated "with respect to", i.e. the
-/// differentiation parameters. The differentiation parameters must conform to
-/// the `Differentiable` protocol.
+/// The `@derivative(of:)` attribute also has an optional `wrt:` clause
+/// specifying the parameters that are differentiated "with respect to", i.e.
+/// the differentiation parameters. The differentiation parameters must conform
+/// to the `Differentiable` protocol.
 ///
 /// If the `wrt:` clause is unspecified, the differentiation parameters are
 /// inferred to be all parameters that conform to `Differentiable`.
 ///
-/// `@derivative` attribute type-checking verifies that the type of the
+/// `@derivative(of:)` attribute type-checking verifies that the type of the
 /// derivative function declaration is consistent with the type of the
 /// referenced original declaration and the differentiation parameters.
 ///
@@ -1868,6 +1870,11 @@ class DerivativeAttr final
       private llvm::TrailingObjects<DerivativeAttr, ParsedAutoDiffParameter> {
   friend TrailingObjects;
 
+  /// The base type repr for the referenced original function. This field is
+  /// non-null only for parsed attributes that reference a qualified original
+  /// declaration. This field is not serialized; type-checking uses it to
+  /// resolve the original declaration, which is serialized.
+  TypeRepr *BaseTypeRepr;
   /// The original function name.
   DeclNameRefWithLoc OriginalFunctionName;
   /// The original function declaration, resolved by the type checker.
@@ -1880,23 +1887,27 @@ class DerivativeAttr final
   Optional<AutoDiffDerivativeFunctionKind> Kind = None;
 
   explicit DerivativeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-                          DeclNameRefWithLoc original,
+                          TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
                           ArrayRef<ParsedAutoDiffParameter> params);
 
   explicit DerivativeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-                          DeclNameRefWithLoc original, IndexSubset *indices);
+                          TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
+                          IndexSubset *parameterIndices);
 
 public:
   static DerivativeAttr *create(ASTContext &context, bool implicit,
                                 SourceLoc atLoc, SourceRange baseRange,
+                                TypeRepr *baseTypeRepr,
                                 DeclNameRefWithLoc original,
                                 ArrayRef<ParsedAutoDiffParameter> params);
 
   static DerivativeAttr *create(ASTContext &context, bool implicit,
                                 SourceLoc atLoc, SourceRange baseRange,
+                                TypeRepr *baseTypeRepr,
                                 DeclNameRefWithLoc original,
-                                IndexSubset *indices);
+                                IndexSubset *parameterIndices);
 
+  TypeRepr *getBaseTypeRepr() const { return BaseTypeRepr; }
   DeclNameRefWithLoc getOriginalFunctionName() const {
     return OriginalFunctionName;
   }
@@ -1940,12 +1951,19 @@ class DerivativeAttr final
 // SWIFT_ENABLE_TENSORFLOW
 // TODO(TF-999): Remove deprecated `@differentiating` attribute.
 using DifferentiatingAttr = DerivativeAttr;
+// SWIFT_ENABLE_TENSORFLOW END
 
-/// Attribute that registers a function as a transpose of another function.
+/// The `@transpose(of:)` attribute registers a function as a transpose of
+/// another function-like declaration: a 'func', 'init', 'subscript', or 'var'
+/// computed property declaration.
+///
+/// The `@transpose(of:)` attribute also has a `wrt:` clause specifying the
+/// parameters that are transposed "with respect to", i.e. the transposed
+/// parameters.
 ///
 /// Examples:
 ///   @transpose(of: foo)
-///   @transpose(of: +, wrt: (lhs, rhs))
+///   @transpose(of: +, wrt: (0, 1))
 class TransposeAttr final
     : public DeclAttribute,
       private llvm::TrailingObjects<TransposeAttr, ParsedAutoDiffParameter> {
@@ -1966,23 +1984,23 @@ class TransposeAttr final
   IndexSubset *ParameterIndices = nullptr;
 
   explicit TransposeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-                         TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
+                         TypeRepr *baseType, DeclNameRefWithLoc original,
                          ArrayRef<ParsedAutoDiffParameter> params);
 
   explicit TransposeAttr(bool implicit, SourceLoc atLoc, SourceRange baseRange,
-                         TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-                         IndexSubset *indices);
+                         TypeRepr *baseType, DeclNameRefWithLoc original,
+                         IndexSubset *parameterIndices);
 
 public:
   static TransposeAttr *create(ASTContext &context, bool implicit,
                                SourceLoc atLoc, SourceRange baseRange,
-                               TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
+                               TypeRepr *baseType, DeclNameRefWithLoc original,
                                ArrayRef<ParsedAutoDiffParameter> params);
 
   static TransposeAttr *create(ASTContext &context, bool implicit,
                                SourceLoc atLoc, SourceRange baseRange,
-                               TypeRepr *baseTypeRepr, DeclNameRefWithLoc original,
-                               IndexSubset *indices);
+                               TypeRepr *baseType, DeclNameRefWithLoc original,
+                               IndexSubset *parameterIndices);
 
   TypeRepr *getBaseTypeRepr() const { return BaseTypeRepr; }
   DeclNameRefWithLoc getOriginalFunctionName() const {
@@ -2018,7 +2036,6 @@ class TransposeAttr final
     return DA->getKind() == DAK_Transpose;
   }
 };
-// SWIFT_ENABLE_TENSORFLOW END
 
 /// Attributes that may be applied to declarations.
 class DeclAttributes {

include/swift/AST/Builtins.def

@@ -654,8 +654,10 @@ BUILTIN_MISC_OPERATION(PoundAssert, "poundAssert", "", Special)
 
 /// globalStringTablePointer has type String -> Builtin.RawPointer.
 /// It returns an immortal, global string table pointer for strings constructed
-/// from string literals.
-BUILTIN_MISC_OPERATION_WITH_SILGEN(GlobalStringTablePointer, "globalStringTablePointer", "", Special)
+/// from string literals. We consider it effects as readnone meaning that it
+/// does not read any memory (note that even though it reads from a string, it
+/// is a pure value and therefore we can consider it as readnone).
+BUILTIN_MISC_OPERATION_WITH_SILGEN(GlobalStringTablePointer, "globalStringTablePointer", "n", Special)
 
 #undef BUILTIN_MISC_OPERATION_WITH_SILGEN