---

yaml
---
r: 343418
b: refs/heads/master-rebranch
c: 992cc03
h: refs/heads/master

Author: rintaro

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 8c17868afaf157d2b0d551027d8a376af8a80e7f
+refs/heads/master-rebranch: 992cc032a7c7b12ca5964bce6a7e0728a0a48ddf
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/CHANGELOG.md

@@ -26,29 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SE-0253][]:
-
-  Values of types that declare `func callAsFunction` methods can be called
-  like functions. The call syntax is shorthand for applying
-  `func callAsFunction` methods.
-
-  ```swift
-  struct Adder {
-    var base: Int
-    func callAsFunction(_ x: Int) -> Int {
-      return x + base
-    }
-  }
-  var adder = Adder(base: 3)
-  adder(10) // returns 13, same as `adder.callAsFunction(10)`
-  ```
-
-  * `func callAsFunction` argument labels are required at call sites.
-  * Multiple `func callAsFunction` methods on a single type are supported.
-  * `mutating func callAsFunction` is supported.
-  * `func callAsFunction` works with `throws` and `rethrows`.
-  * `func callAsFunction` works with trailing closures.
-
 * [SR-4206][]:
 
   A method override is no longer allowed to have a generic signature with 
@@ -7734,7 +7711,6 @@ Swift 1.0
 [SE-0244]: <https://github.com/apple/swift-evolution/blob/master/proposals/0244-opaque-result-types.md>
 [SE-0245]: <https://github.com/apple/swift-evolution/blob/master/proposals/0245-array-uninitialized-initializer.md>
 [SE-0252]: <https://github.com/apple/swift-evolution/blob/master/proposals/0252-keypath-dynamic-member-lookup.md>
-[SE-0253]: <https://github.com/apple/swift-evolution/blob/master/proposals/0253-callable.md>
 [SE-0254]: <https://github.com/apple/swift-evolution/blob/master/proposals/0254-static-subscripts.md>
 
 [SR-106]: <https://bugs.swift.org/browse/SR-106>

branches/master-rebranch/include/swift/AST/ASTContext.h

@@ -69,6 +69,7 @@ namespace swift {
   class LazyGenericContextData;
   class LazyIterableDeclContextData;
   class LazyMemberLoader;
+  class LazyMemberParser;
   class LazyResolver;
   class PatternBindingDecl;
   class PatternBindingInitializer;
@@ -424,6 +425,12 @@ class ASTContext final {
   void setLazyResolver(LazyResolver *resolver);
 
 public:
+  /// Add a lazy parser for resolving members later.
+  void addLazyParser(LazyMemberParser *parser);
+
+  /// Remove a lazy parser.
+  void removeLazyParser(LazyMemberParser *parser);
+
   /// getIdentifier - Return the uniqued and AST-Context-owned version of the
   /// specified string.
   Identifier getIdentifier(StringRef Str) const;
@@ -815,6 +822,12 @@ class ASTContext final {
   LazyContextData *getOrCreateLazyContextData(const DeclContext *decl,
                                               LazyMemberLoader *lazyLoader);
 
+  /// Use the lazy parsers associated with the context to populate the members
+  /// of the given decl context.
+  ///
+  /// \param IDC The context whose member decls should be lazily parsed.
+  std::vector<Decl *> parseMembers(IterableDeclContext *IDC);
+
   /// Get the lazy function data for the given generic context.
   ///
   /// \param lazyLoader If non-null, the lazy loader to use when creating the

branches/master-rebranch/include/swift/AST/ASTNode.h

@@ -36,10 +36,10 @@ namespace swift {
   enum class DeclKind : uint8_t;
   enum class StmtKind;
 
-  struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
+  struct ASTNode : public llvm::PointerUnion3<Expr*, Stmt*, Decl*> {
     // Inherit the constructors from PointerUnion.
-    using PointerUnion::PointerUnion;
-
+    using PointerUnion3::PointerUnion3;
+    
     SourceRange getSourceRange() const;
 
     /// Return the location of the start of the statement.

branches/master-rebranch/include/swift/AST/Decl.h

@@ -4789,7 +4789,7 @@ class VarDecl : public AbstractStorageDecl {
   };
 
 protected:
-  PointerUnion<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
+  PointerUnion3<PatternBindingDecl *, Stmt *, VarDecl *> Parent;
 
   VarDecl(DeclKind kind, bool isStatic, Introducer introducer,
           bool issCaptureList, SourceLoc nameLoc, Identifier name,
@@ -5594,8 +5594,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     SourceRange BodyRange;
   };
 
-  friend class ParseAbstractFunctionBodyRequest;
-
   CaptureInfo Captures;
 
   /// Location of the 'throws' token.

branches/master-rebranch/include/swift/AST/DeclContext.h

@@ -51,6 +51,7 @@ namespace swift {
   class GenericParamList;
   class LazyResolver;
   class LazyMemberLoader;
+  class LazyMemberParser;
   class GenericSignature;
   class GenericTypeParamDecl;
   class GenericTypeParamType;

branches/master-rebranch/include/swift/AST/DiagnosticEngine.h

@@ -657,7 +657,7 @@ namespace swift {
     }
 
     /// Return all \c DiagnosticConsumers.
-    ArrayRef<DiagnosticConsumer *> getConsumers() const {
+    ArrayRef<DiagnosticConsumer *> getConsumers() {
       return Consumers;
     }
 

branches/master-rebranch/include/swift/AST/DiagnosticSuppression.h

@@ -37,7 +37,6 @@ class DiagnosticSuppression {
 public:
   explicit DiagnosticSuppression(DiagnosticEngine &diags);
   ~DiagnosticSuppression();
-  static bool isEnabled(const DiagnosticEngine &diags);
 };
 
 }

branches/master-rebranch/include/swift/AST/DiagnosticsClangImporter.def

@@ -91,6 +91,10 @@ WARNING(implicit_bridging_header_imported_from_module,none,
         "is deprecated and will be removed in a later version of Swift",
         (StringRef, Identifier))
 
+WARNING(clang_vfs_overlay_is_ignored,none,
+        "ignoring '-ivfsoverlay' options provided to '-Xcc' in favor of "
+        "'-vfsoverlay'", ())
+
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

branches/master-rebranch/include/swift/AST/DiagnosticsSema.def

@@ -361,6 +361,9 @@ ERROR(cannot_convert_default_arg_value,none,
       (Type,Type))
 ERROR(cannot_convert_default_arg_value_protocol,none,
       "default argument value of type %0 does not conform to %1", (Type,Type))
+ERROR(default_argument_literal_cannot_convert, none,
+      "cannot call %0 %1 because default argument of type %2 cannot be "
+      "converted to type %3", (DescriptiveDeclKind, DeclName, Type, Type))
 ERROR(cannot_convert_default_arg_value_nil,none,
       "nil default argument value cannot be converted to type %0", (Type))
 
@@ -1625,11 +1628,6 @@ NOTE(objc_generic_extension_using_type_parameter_here,none,
      "generic parameter used here", ())
 NOTE(objc_generic_extension_using_type_parameter_try_objc,none,
      "add '@objc' to allow uses of 'self' within the function body", ())
-ERROR(invalid_nominal_extension,none,
-      "extension of type %0 must be declared as an extension of %1",
-      (Type, Type))
-NOTE(invalid_nominal_extension_rewrite,none,
-     "did you mean to extend %0 instead?", (Type))
 
 // Protocols
 ERROR(type_does_not_conform,none,

branches/master-rebranch/include/swift/AST/GenericSignatureBuilder.h

@@ -92,10 +92,10 @@ class GenericSignatureBuilder {
   class ResolvedType;
 
   using UnresolvedRequirementRHS =
-      llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
+      llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
 
   using RequirementRHS =
-    llvm::PointerUnion<Type, PotentialArchetype *, LayoutConstraint>;
+    llvm::PointerUnion3<Type, PotentialArchetype *, LayoutConstraint>;
 
   /// The location of a requirement as written somewhere in the source.
   typedef llvm::PointerUnion<const TypeRepr *, const RequirementRepr *>
@@ -1374,8 +1374,8 @@ class GenericSignatureBuilder::FloatingRequirementSource {
   } kind;
 
   using Storage =
-    llvm::PointerUnion<const RequirementSource *, const TypeRepr *,
-                       const RequirementRepr *>;
+    llvm::PointerUnion3<const RequirementSource *, const TypeRepr *,
+                        const RequirementRepr *>;
 
   Storage storage;
 

branches/master-rebranch/include/swift/AST/Identifier.h

@@ -590,7 +590,7 @@ class DeclName {
   llvm::raw_ostream &printPretty(llvm::raw_ostream &os) const;
 
   /// Dump this name to standard error.
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
+  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
                             "only for use within the debugger");
 };
 
@@ -672,7 +672,7 @@ class ObjCSelector {
   }
 
   /// Dump this selector to standard error.
-  LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
+  LLVM_ATTRIBUTE_DEPRECATED(void dump() const,
                             "only for use within the debugger");
 
   /// Compare two Objective-C selectors, producing -1 if \c *this comes before

branches/master-rebranch/include/swift/AST/LazyResolver.h

@@ -85,6 +85,21 @@ class LazyContextData {
   LazyMemberLoader *loader;
 };
 
+/// A class that can lazily parse members for an iterable decl context.
+class LazyMemberParser {
+public:
+  virtual ~LazyMemberParser() = default;
+
+  /// Retrieves the parsed members for the given decl context \p IDC.
+  virtual std::vector<Decl *> parseMembers(IterableDeclContext *IDC) = 0;
+
+  /// Return whether the iterable decl context needs parsing.
+  virtual bool hasUnparsedMembers(const IterableDeclContext *IDC) = 0;
+
+  /// Parse all delayed decl list members.
+  virtual void parseAllDelayedDeclLists() = 0;
+};
+
 /// Context data for generic contexts.
 class LazyGenericContextData : public LazyContextData {
 public:

branches/master-rebranch/include/swift/AST/ModuleLoader.h

@@ -24,10 +24,6 @@
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/ADT/TinyPtrVector.h"
 
-namespace llvm {
-class FileCollector;
-}
-
 namespace clang {
 class DependencyCollector;
 }
@@ -58,9 +54,8 @@ enum class Bridgeability : unsigned {
 class DependencyTracker {
   std::shared_ptr<clang::DependencyCollector> clangCollector;
 public:
-  explicit DependencyTracker(
-      bool TrackSystemDeps,
-      std::shared_ptr<llvm::FileCollector> FileCollector = {});
+
+  explicit DependencyTracker(bool TrackSystemDeps);
 
   /// Adds a file as a dependency.
   ///

branches/master-rebranch/include/swift/AST/ParseRequests.h

@@ -48,28 +48,6 @@ class ParseMembersRequest :
   bool isCached() const { return true; }
 };
 
-/// Parse the body of a function, initializer, or deinitializer.
-class ParseAbstractFunctionBodyRequest :
-    public SimpleRequest<ParseAbstractFunctionBodyRequest,
-                         BraceStmt *(AbstractFunctionDecl *),
-                         CacheKind::SeparatelyCached>
-{
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  // Evaluation.
-  BraceStmt *evaluate(Evaluator &evaluator, AbstractFunctionDecl *afd) const;
-
-public:
-  // Caching
-  bool isCached() const { return true; }
-  Optional<BraceStmt *> getCachedResult() const;
-  void cacheResult(BraceStmt *value) const;
-};
-
 /// The zone number for the parser.
 #define SWIFT_TYPEID_ZONE Parse
 #define SWIFT_TYPEID_HEADER "swift/AST/ParseTypeIDZone.def"

branches/master-rebranch/include/swift/AST/ParseTypeIDZone.def

@@ -15,4 +15,3 @@
 //===----------------------------------------------------------------------===//
 
 SWIFT_REQUEST(Parse, ParseMembersRequest)
-SWIFT_REQUEST(Parse, ParseAbstractFunctionBodyRequest)

branches/master-rebranch/include/swift/AST/TypeCheckRequests.h

@@ -369,7 +369,7 @@ struct WhereClauseOwner {
 
   /// The source of the where clause, which can be a generic parameter list
   /// or a declaration that can have a where clause.
-  llvm::PointerUnion<GenericParamList *, Decl *, SpecializeAttr *> source;
+  llvm::PointerUnion3<GenericParamList *, Decl *, SpecializeAttr *> source;
 
   WhereClauseOwner(Decl *decl);
 

branches/master-rebranch/include/swift/Basic/LLVM.h

@@ -42,7 +42,8 @@ namespace llvm {
   template<typename T> class MutableArrayRef;
   template<typename T> class TinyPtrVector;
   template<typename T> class Optional;
-  template <typename ...PTs> class PointerUnion;
+  template <typename PT1, typename PT2> class PointerUnion;
+  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
   class SmallBitVector;
 
   // Other common classes.
@@ -67,6 +68,7 @@ namespace swift {
   using llvm::None;
   using llvm::Optional;
   using llvm::PointerUnion;
+  using llvm::PointerUnion3;
   using llvm::SmallBitVector;
   using llvm::SmallPtrSet;
   using llvm::SmallPtrSetImpl;

branches/master-rebranch/include/swift/ClangImporter/ClangImporter.h

@@ -23,7 +23,6 @@
 
 namespace llvm {
   class Triple;
-  class FileCollector;
   template<typename Fn> class function_ref;
 }
 
@@ -148,8 +147,7 @@ class ClangImporter final : public ClangModuleLoader {
   /// Create a new clang::DependencyCollector customized to
   /// ClangImporter's specific uses.
   static std::shared_ptr<clang::DependencyCollector>
-  createDependencyCollector(bool TrackSystemDeps,
-                            std::shared_ptr<llvm::FileCollector> FileCollector);
+  createDependencyCollector(bool TrackSystemDeps);
 
   /// Append visible module names to \p names. Note that names are possibly
   /// duplicated, and not guaranteed to be ordered in any way.

branches/master-rebranch/include/swift/ClangImporter/ClangImporterOptions.h

@@ -96,6 +96,10 @@ class ClangImporterOptions {
   /// When set, don't enforce warnings with -Werror.
   bool DebuggerSupport = false;
 
+  /// When set, clobber the Clang instance's virtual file system with the Swift
+  /// virtual file system.
+  bool ForceUseSwiftVirtualFileSystem = false;
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

branches/master-rebranch/include/swift/Frontend/Frontend.h

@@ -616,6 +616,7 @@ class CompilerInstance {
 
 private:
   void createREPLFile(const ImplicitImports &implicitImports);
+  std::unique_ptr<DelayedParsingCallbacks> computeDelayedParsingCallback();
 
   void addMainFileToModule(const ImplicitImports &implicitImports);
 
@@ -624,17 +625,20 @@ class CompilerInstance {
                               SourceFile::ASTStage_t LimitStage);
 
   void parseLibraryFile(unsigned BufferID,
-                        const ImplicitImports &implicitImports);
+                        const ImplicitImports &implicitImports,
+                        DelayedParsingCallbacks *DelayedCB);
 
   /// Return true if had load error
   bool
-  parsePartialModulesAndLibraryFiles(const ImplicitImports &implicitImports);
+  parsePartialModulesAndLibraryFiles(const ImplicitImports &implicitImports,
+                                     DelayedParsingCallbacks *DelayedCB);
 
   OptionSet<TypeCheckingFlags> computeTypeCheckingOptions();
 
   void forEachFileToTypeCheck(llvm::function_ref<void(SourceFile &)> fn);
 
   void parseAndTypeCheckMainFileUpTo(SourceFile::ASTStage_t LimitStage,
+                                     DelayedParsingCallbacks *DelayedParseCB,
                                      OptionSet<TypeCheckingFlags> TypeCheckOptions);
 
   void finishTypeChecking(OptionSet<TypeCheckingFlags> TypeCheckOptions);

branches/master-rebranch/include/swift/LLVMPasses/Passes.h

@@ -30,14 +30,8 @@ namespace swift {
                     const llvm::PreservedAnalyses &) { return false; }
 
     using AAResultBase::getModRefInfo;
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc) {
-      llvm::AAQueryInfo AAQI;
-      return getModRefInfo(Call, Loc, AAQI);
-    }
-    llvm::ModRefInfo getModRefInfo(const llvm::CallBase *Call,
-                                   const llvm::MemoryLocation &Loc,
-                                   llvm::AAQueryInfo &AAQI);
+    llvm::ModRefInfo getModRefInfo(llvm::ImmutableCallSite CS,
+                                   const llvm::MemoryLocation &Loc);
   };
 
   class SwiftAAWrapperPass : public llvm::ImmutablePass {