---

yaml
---
r: 343991
b: refs/heads/master-rebranch
c: 2f325fa
h: refs/heads/master
i:
  343989: 01d5866
  343987: 8135840
  343983: fe6d72a

Author: xedin

[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: f15ecf7f2fce30c0a37f8933ddfdfae78ad14be4
+refs/heads/master-rebranch: 2f325fa1d8515b42ff02bc53962b9e0bd87ac143
 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/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

@@ -1505,13 +1505,12 @@ class alignas(8) _GenericContext {
   TrailingWhereClause *TrailingWhere = nullptr;
 
   /// The generic signature of this declaration.
-  llvm::PointerIntPair<GenericSignature *, 1, bool> GenericSigAndBit;
+  GenericSignature *GenericSig = nullptr;
 };
 
 class GenericContext : private _GenericContext, public DeclContext {
   friend class GenericParamListRequest;
-  friend class GenericSignatureRequest;
-  
+
 protected:
   GenericContext(DeclContextKind Kind, DeclContext *Parent,
                  GenericParamList *Params);
@@ -1535,8 +1534,7 @@ class GenericContext : private _GenericContext, public DeclContext {
   /// }
   /// \endcode
   bool isGeneric() const { return getGenericParams() != nullptr; }
-  bool hasComputedGenericSignature() const;
-  
+
   /// Retrieve the trailing where clause for this extension, if any.
   TrailingWhereClause *getTrailingWhereClause() const {
     return TrailingWhere;
@@ -4790,7 +4788,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,

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 *>
@@ -1373,8 +1373,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/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/TypeCheckRequests.h

@@ -365,7 +365,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);
 
@@ -1160,27 +1160,6 @@ class FunctionOperatorRequest :
   bool isCached() const { return true; }
 };
 
-class GenericSignatureRequest :
-    public SimpleRequest<GenericSignatureRequest,
-                         GenericSignature *(GenericContext *),
-                         CacheKind::SeparatelyCached> {
-public:
-  using SimpleRequest::SimpleRequest;
-  
-private:
-  friend SimpleRequest;
-  
-  // Evaluation.
-  llvm::Expected<GenericSignature *>
-  evaluate(Evaluator &evaluator, GenericContext *value) const;
-  
-public:              
-  // Separate caching.
-  bool isCached() const { return true; }
-  Optional<GenericSignature *> getCachedResult() const;
-  void cacheResult(GenericSignature *value) const;
-};
-
 // Allow AnyValue to compare two Type values, even though Type doesn't
 // support ==.
 template<>

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

@@ -49,9 +49,6 @@ SWIFT_REQUEST(TypeChecker, FunctionBuilderTypeRequest, Type(ValueDecl *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, FunctionOperatorRequest, OperatorDecl *(FuncDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(NameLookup, GenericSignatureRequest,
-              GenericSignature *(GenericContext *),
-              SeparatelyCached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, InferredGenericSignatureRequest,
               GenericSignature *(ModuleDecl *, GenericSignature *,
                                  SmallVector<GenericParamList *, 2>,

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;
 }
 
@@ -150,8 +149,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/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 {

branches/master-rebranch/include/swift/Parse/Parser.h

@@ -40,7 +40,7 @@
 #include "llvm/ADT/SetVector.h"
 
 namespace llvm {
-  template <typename...  PTs> class PointerUnion;
+  template <typename PT1, typename PT2, typename PT3> class PointerUnion3;
 }
 
 namespace swift {

branches/master-rebranch/include/swift/SIL/BranchPropagatedUser.h

@@ -13,7 +13,6 @@
 #ifndef SWIFT_SIL_BRANCHPROPAGATEDUSER_H
 #define SWIFT_SIL_BRANCHPROPAGATEDUSER_H
 
-#include "swift/Basic/LLVM.h"
 #include "swift/SIL/SILBasicBlock.h"
 #include "swift/SIL/SILInstruction.h"
 #include "llvm/ADT/DenseMap.h"
@@ -28,68 +27,68 @@ namespace swift {
 /// BranchPropagatedUser and friends break all such critical edges.
 class BranchPropagatedUser {
   using InnerTy = llvm::PointerIntPair<SILInstruction *, 1>;
-  InnerTy user;
+  InnerTy User;
 
 public:
-  BranchPropagatedUser(SILInstruction *inst) : user(inst) {
-    assert(!isa<CondBranchInst>(inst));
+  BranchPropagatedUser(SILInstruction *I) : User(I) {
+    assert(!isa<CondBranchInst>(I));
   }
 
-  BranchPropagatedUser(CondBranchInst *cbi) : user(cbi) {}
+  BranchPropagatedUser(CondBranchInst *I) : User(I) {}
 
-  BranchPropagatedUser(CondBranchInst *cbi, unsigned successorIndex)
-      : user(cbi, successorIndex) {
-    assert(successorIndex == CondBranchInst::TrueIdx ||
-           successorIndex == CondBranchInst::FalseIdx);
+  BranchPropagatedUser(CondBranchInst *I, unsigned SuccessorIndex)
+      : User(I, SuccessorIndex) {
+    assert(SuccessorIndex == CondBranchInst::TrueIdx ||
+           SuccessorIndex == CondBranchInst::FalseIdx);
   }
 
-  BranchPropagatedUser(const BranchPropagatedUser &other) : user(other.user) {}
-  BranchPropagatedUser &operator=(const BranchPropagatedUser &other) {
-    user = other.user;
+  BranchPropagatedUser(const BranchPropagatedUser &Other) : User(Other.User) {}
+  BranchPropagatedUser &operator=(const BranchPropagatedUser &Other) {
+    User = Other.User;
     return *this;
   }
 
-  operator SILInstruction *() { return user.getPointer(); }
-  operator const SILInstruction *() const { return user.getPointer(); }
+  operator SILInstruction *() { return User.getPointer(); }
+  operator const SILInstruction *() const { return User.getPointer(); }
 
-  SILInstruction *getInst() const { return user.getPointer(); }
+  SILInstruction *getInst() const { return User.getPointer(); }
 
   SILBasicBlock *getParent() const {
     if (!isCondBranchUser()) {
       return getInst()->getParent();
     }
 
-    auto *cbi = cast<CondBranchInst>(getInst());
-    unsigned number = getCondBranchSuccessorID();
-    if (number == CondBranchInst::TrueIdx)
-      return cbi->getTrueBB();
-    return cbi->getFalseBB();
+    auto *CBI = cast<CondBranchInst>(getInst());
+    unsigned Number = getCondBranchSuccessorID();
+    if (Number == CondBranchInst::TrueIdx)
+      return CBI->getTrueBB();
+    return CBI->getFalseBB();
   }
 
   bool isCondBranchUser() const {
-    return isa<CondBranchInst>(user.getPointer());
+    return isa<CondBranchInst>(User.getPointer());
   }
 
   unsigned getCondBranchSuccessorID() const {
     assert(isCondBranchUser());
-    return user.getInt();
+    return User.getInt();
   }
 
   SILBasicBlock::iterator getIterator() const {
-    return user.getPointer()->getIterator();
+    return User.getPointer()->getIterator();
   }
 
   void *getAsOpaqueValue() const {
-    return llvm::PointerLikeTypeTraits<InnerTy>::getAsVoidPointer(user);
+    return llvm::PointerLikeTypeTraits<InnerTy>::getAsVoidPointer(User);
   }
 
   static BranchPropagatedUser getFromOpaqueValue(void *p) {
-    InnerTy tmpUser =
+    InnerTy TmpUser =
         llvm::PointerLikeTypeTraits<InnerTy>::getFromVoidPointer(p);
-    if (auto *cbi = dyn_cast<CondBranchInst>(tmpUser.getPointer())) {
-      return BranchPropagatedUser(cbi, tmpUser.getInt());
+    if (auto *CBI = dyn_cast<CondBranchInst>(TmpUser.getPointer())) {
+      return BranchPropagatedUser(CBI, TmpUser.getInt());
     }
-    return BranchPropagatedUser(tmpUser.getPointer());
+    return BranchPropagatedUser(TmpUser.getPointer());
   }
 
   enum {