---

yaml
---
r: 343243
b: refs/heads/master-rebranch
c: 1ca90ef
h: refs/heads/master
i:
  343241: 02fcbd3
  343239: 5bc004b

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: a3dfad6a2b63f143baf539d583f40eaac1037b37
+refs/heads/master-rebranch: 1ca90ef757f54c712ac76e0041e9af7d67ffbe33
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

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

@@ -826,7 +826,7 @@ class ASTContext final {
   /// of the given decl context.
   ///
   /// \param IDC The context whose member decls should be lazily parsed.
-  std::vector<Decl *> parseMembers(IterableDeclContext *IDC);
+  void parseMembers(IterableDeclContext *IDC);
 
   /// Get the lazy function data for the given generic context.
   ///

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/ASTTypeIDZone.def

@@ -33,4 +33,3 @@ SWIFT_TYPEID(AncestryFlags)
 SWIFT_TYPEID_NAMED(GenericSignature *, GenericSignature)
 SWIFT_TYPEID_NAMED(GenericTypeParamType *, GenericTypeParamType)
 SWIFT_TYPEID(Requirement)
-SWIFT_TYPEID_NAMED(IterableDeclContext *, IterableDeclContext)

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

@@ -17,26 +17,19 @@
 #ifndef SWIFT_AST_ASTTYPEIDS_H
 #define SWIFT_AST_ASTTYPEIDS_H
 
-#include "swift/Basic/LLVM.h"
 #include "swift/Basic/TypeID.h"
 namespace swift {
 
 class CustomAttr;
-class Decl;
 class GenericSignature;
 class GenericTypeParamType;
-class IterableDeclContext;
 class NominalTypeDecl;
-class OperatorDecl;
 struct PropertyWrapperBackingPropertyInfo;
 struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
 struct PropertyWrapperMutability;
-class ProtocolDecl;
 class Requirement;
-enum class ResilienceExpansion : unsigned;
 class Type;
-class ValueDecl;
 class VarDecl;
 class TypeAliasDecl;
 class Type;

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,
@@ -7248,17 +7248,6 @@ void simple_display(llvm::raw_ostream &out, const Decl *decl);
 /// Display ValueDecl subclasses.
 void simple_display(llvm::raw_ostream &out, const ValueDecl *decl);
 
-/// Display ExtensionDecls.
-inline void simple_display(llvm::raw_ostream &out, const ExtensionDecl *decl) {
-  simple_display(out, static_cast<const Decl *>(decl));
-}
-
-/// Display NominalTypeDecls.
-inline void simple_display(llvm::raw_ostream &out,
-                           const NominalTypeDecl *decl) {
-  simple_display(out, static_cast<const Decl *>(decl));
-}
-
 /// Extract the source location from the given declaration.
 SourceLoc extractNearestSourceLoc(const Decl *decl);
 
@@ -7272,11 +7261,6 @@ inline SourceLoc extractNearestSourceLoc(const GenericTypeDecl *type) {
   return extractNearestSourceLoc(static_cast<const Decl *>(type));
 }
 
-/// Extract the source location from the given declaration.
-inline SourceLoc extractNearestSourceLoc(const NominalTypeDecl *type) {
-  return extractNearestSourceLoc(static_cast<const Decl *>(type));
-}
-
 /// Extract the source location from the given declaration.
 inline SourceLoc extractNearestSourceLoc(const AbstractFunctionDecl *func) {
   return extractNearestSourceLoc(static_cast<const Decl *>(func));

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

@@ -699,8 +699,8 @@ class IterableDeclContext {
   /// time, but I think it's a better trade to just keep a count here.
   unsigned MemberCount : 29;
 
-  /// Whether we have already added the parsed members into the context.
-  unsigned AddedParsedMembers : 1;
+  /// Whether parsing the members of this context has been delayed.
+  unsigned HasUnparsedMembers : 1;
 
   /// Whether delayed parsing detected a possible operator definition
   /// while skipping the body of this context.
@@ -722,8 +722,8 @@ class IterableDeclContext {
   IterableDeclContext(IterableDeclContextKind kind)
     : LastDeclAndKind(nullptr, kind) {
     MemberCount = 0;
-    AddedParsedMembers = 0;
     HasOperatorDeclarations = 0;
+    HasUnparsedMembers = 0;
     HasNestedClassDeclarations = 0;
   }
 
@@ -732,7 +732,13 @@ class IterableDeclContext {
     return LastDeclAndKind.getInt();
   }
 
-  bool hasUnparsedMembers() const;
+  bool hasUnparsedMembers() const {
+    return HasUnparsedMembers;
+  }
+
+  void setHasUnparsedMembers() {
+    HasUnparsedMembers = 1;
+  }
 
   bool maybeHasOperatorDeclarations() const {
     return HasOperatorDeclarations;
@@ -833,14 +839,9 @@ void simple_display(llvm::raw_ostream &out, const ParamT *dc) {
     out << "(null)";
 }
 
-void simple_display(llvm::raw_ostream &out, const IterableDeclContext *idc);
-
 /// Extract the source location from the given declaration context.
 SourceLoc extractNearestSourceLoc(const DeclContext *dc);
 
-/// Extract the source location from the given declaration context.
-SourceLoc extractNearestSourceLoc(const IterableDeclContext *idc);
-
 } // end namespace swift
 
 namespace llvm {

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/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/LazyResolver.h

@@ -90,8 +90,10 @@ 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;
+  /// Populates a given decl context \p IDC with all of its members.
+  ///
+  /// The implementation should add the members to IDC.
+  virtual void parseMembers(IterableDeclContext *IDC) = 0;
 
   /// Return whether the iterable decl context needs parsing.
   virtual bool hasUnparsedMembers(const IterableDeclContext *IDC) = 0;

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

@@ -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/AST/ParseTypeIDZone.def

@@ -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/AST/TypeCheckRequests.h

@@ -195,10 +195,6 @@ FRONTEND_STATISTIC(Parse, NumFunctionsParsed)
 /// Number of full braced decl list parsed.
 FRONTEND_STATISTIC(Parse, NumIterableDeclContextParsed)
 
-#define SWIFT_REQUEST(ZONE, NAME) FRONTEND_STATISTIC(Parse, NAME)
-#include "swift/AST/ParseTypeIDZone.def"
-#undef SWIFT_REQUEST
-
 /// Number of conformances that were deserialized by this frontend job.
 FRONTEND_STATISTIC(Sema, NumConformancesDeserialized)
 

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

@@ -35,7 +35,6 @@ enum class Zone : uint8_t {
   IDE                     = 137,
   IDETypeChecking         = 97,
   NameLookup              = 9,
-  Parse                   = 8,
   TypeChecker             = 10,
   // N.B. This is not a formal zone and exists solely to support the unit tests.
   ArithmeticEvaluator     = 255,

branches/master-rebranch/include/swift/Basic/Statistics.def

@@ -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/Basic/TypeID.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 {