---

yaml
---
r: 343711
b: refs/heads/master-rebranch
c: bc1aa97
h: refs/heads/master
i:
  343709: 592dc48
  343707: 9f47609
  343703: 45402d2
  343695: 2f48b9e
  343679: 7aebf3b

Author: slavapestov

[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: 57bf724b1ea478f68ce7199a5ec9884ebc1eeb96
+refs/heads/master-rebranch: bc1aa97e4eb51ad6c9ffd67290f04357a8c5ccda
 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

@@ -4788,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/Module.h

@@ -361,7 +361,7 @@ class ModuleDecl : public DeclContext, public TypeDecl {
   /// within the current module.
   ///
   /// This does a simple local lookup, not recursively looking through imports.
-  void lookupValue(DeclName Name, NLKind LookupKind,
+  void lookupValue(AccessPathTy AccessPath, DeclName Name, NLKind LookupKind,
                    SmallVectorImpl<ValueDecl*> &Result) const;
 
   /// Look up a local type declaration by its mangled name.
@@ -629,7 +629,8 @@ class FileUnit : public DeclContext {
   /// within this file.
   ///
   /// This does a simple local lookup, not recursively looking through imports.
-  virtual void lookupValue(DeclName name, NLKind lookupKind,
+  virtual void lookupValue(ModuleDecl::AccessPathTy accessPath, DeclName name,
+                           NLKind lookupKind,
                            SmallVectorImpl<ValueDecl*> &result) const = 0;
 
   /// Look up a local type declaration by its mangled name.
@@ -1055,7 +1056,8 @@ class SourceFile final : public FileUnit {
   void cacheVisibleDecls(SmallVectorImpl<ValueDecl *> &&globals) const;
   const SmallVectorImpl<ValueDecl *> &getCachedVisibleDecls() const;
 
-  virtual void lookupValue(DeclName name, NLKind lookupKind,
+  virtual void lookupValue(ModuleDecl::AccessPathTy accessPath, DeclName name,
+                           NLKind lookupKind,
                            SmallVectorImpl<ValueDecl*> &result) const override;
 
   virtual void lookupVisibleDecls(ModuleDecl::AccessPathTy accessPath,
@@ -1279,7 +1281,8 @@ class BuiltinUnit final : public FileUnit {
 public:
   explicit BuiltinUnit(ModuleDecl &M);
 
-  virtual void lookupValue(DeclName name, NLKind lookupKind,
+  virtual void lookupValue(ModuleDecl::AccessPathTy accessPath, DeclName name,
+                           NLKind lookupKind,
                            SmallVectorImpl<ValueDecl*> &result) const override;
 
   /// Find all Objective-C methods with the given selector.

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);
 

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/ClangImporter/ClangModule.h

@@ -64,7 +64,8 @@ class ClangModuleUnit final : public LoadedFile {
 
   virtual bool isSystemModule() const override;
 
-  virtual void lookupValue(DeclName name, NLKind lookupKind,
+  virtual void lookupValue(ModuleDecl::AccessPathTy accessPath,
+                           DeclName name, NLKind lookupKind,
                            SmallVectorImpl<ValueDecl*> &results) const override;
 
   virtual TypeDecl *

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

@@ -141,7 +141,7 @@ class ParsedRawSyntaxNode {
     case DataKind::DeferredLayout:
       return getDeferredLayoutRange();
     case DataKind::DeferredToken:
-      return getDeferredTokenRange();
+      return getDeferredTokenRangeWithoutBackticks();
     default:
       llvm_unreachable("node not deferred");
     }
@@ -194,7 +194,7 @@ class ParsedRawSyntaxNode {
 
     return CharSourceRange{begin, len};
   }
-  CharSourceRange getDeferredTokenRange() const {
+  CharSourceRange getDeferredTokenRangeWithoutBackticks() const {
     assert(DK == DataKind::DeferredToken);
     return CharSourceRange{DeferredToken.TokLoc, DeferredToken.TokLength};
   }

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/Parse/Token.h

@@ -248,6 +248,17 @@ class Token {
     return CharSourceRange(getLoc(), getLength());
   }
 
+  CharSourceRange getRangeWithoutBackticks() const {
+    SourceLoc TokLoc = getLoc();
+    unsigned TokLength = getLength();
+    if (isEscapedIdentifier()) {
+      // Adjust to account for the backticks.
+      TokLoc = TokLoc.getAdvancedLoc(1);
+      TokLength -= 2;
+    }
+    return CharSourceRange(TokLoc, TokLength);
+  }
+
   bool hasComment() const {
     return CommentLength != 0;
   }

branches/master-rebranch/include/swift/SILOptimizer/Analysis/LoopRegionAnalysis.h

@@ -384,7 +384,7 @@ class LoopRegion {
 private:
   /// A pointer to one of a Loop, Basic Block, or Function represented by this
   /// region.
-  llvm::PointerUnion<FunctionTy *, LoopTy *, BlockTy *> Ptr;
+  llvm::PointerUnion3<FunctionTy *, LoopTy *, BlockTy *> Ptr;
 
   /// The ID of this region.
   unsigned ID;

branches/master-rebranch/include/swift/Serialization/SerializedModuleLoader.h

@@ -268,7 +268,8 @@ class SerializedASTFile final : public LoadedFile {
 
   virtual bool isSystemModule() const override;
 
-  virtual void lookupValue(DeclName name, NLKind lookupKind,
+  virtual void lookupValue(ModuleDecl::AccessPathTy accessPath,
+                           DeclName name, NLKind lookupKind,
                            SmallVectorImpl<ValueDecl*> &results) const override;
 
   virtual StringRef

branches/master-rebranch/include/swift/Syntax/TokenSyntax.h

@@ -80,15 +80,6 @@ class TokenSyntax final : public Syntax {
     return getRaw()->getTokenText();
   }
 
-  StringRef getIdentifierText() const {
-    StringRef text = getText();
-    if (text.front() == '`') {
-      assert(text.back() == '`');
-      return text.slice(1, text.size() - 1);
-    }
-    return text;
-  }
-
   static bool kindof(SyntaxKind Kind) {
     return isTokenKind(Kind);
   }

branches/master-rebranch/lib/AST/ASTContext.cpp

@@ -654,7 +654,7 @@ void ASTContext::lookupInSwiftModule(
 
   // Find all of the declarations with this name in the Swift module.
   auto identifier = getIdentifier(name);
-  M->lookupValue(identifier, NLKind::UnqualifiedLookup, results);
+  M->lookupValue({ }, identifier, NLKind::UnqualifiedLookup, results);
 }
 
 FuncDecl *ASTContext::getPlusFunctionOnRangeReplaceableCollection() const {
@@ -832,7 +832,7 @@ StructDecl *ASTContext::getObjCBoolDecl() const {
     SmallVector<ValueDecl *, 1> results;
     auto *Context = const_cast<ASTContext *>(this);
     if (ModuleDecl *M = Context->getModuleByName(Id_ObjectiveC.str())) {
-      M->lookupValue(getIdentifier("ObjCBool"), NLKind::UnqualifiedLookup,
+      M->lookupValue({ }, getIdentifier("ObjCBool"), NLKind::UnqualifiedLookup,
                      results);
       for (auto result : results) {
         if (auto structDecl = dyn_cast<StructDecl>(result)) {
@@ -899,7 +899,7 @@ ProtocolDecl *ASTContext::getProtocol(KnownProtocolKind kind) const {
 
   if (!M)
     return nullptr;
-  M->lookupValue(getIdentifier(getProtocolName(kind)),
+  M->lookupValue({ }, getIdentifier(getProtocolName(kind)),
                  NLKind::UnqualifiedLookup, results);
 
   for (auto result : results) {
@@ -3959,7 +3959,7 @@ static NominalTypeDecl *findUnderlyingTypeInModule(ASTContext &ctx,
                                                    ModuleDecl *module) {
   // Find all of the declarations with this name in the Swift module.
   SmallVector<ValueDecl *, 1> results;
-  module->lookupValue(name, NLKind::UnqualifiedLookup, results);
+  module->lookupValue({ }, name, NLKind::UnqualifiedLookup, results);
   for (auto result : results) {
     if (auto nominal = dyn_cast<NominalTypeDecl>(result))
       return nominal;

branches/master-rebranch/lib/AST/ASTDemangler.cpp

@@ -97,9 +97,11 @@ ASTBuilder::createBuiltinType(StringRef builtinName,
   if (builtinName.startswith(BUILTIN_TYPE_NAME_PREFIX)) {
     SmallVector<ValueDecl *, 1> decls;
 
+    ModuleDecl::AccessPathTy accessPath;
     StringRef strippedName =
         builtinName.drop_front(BUILTIN_TYPE_NAME_PREFIX.size());
-    Ctx.TheBuiltinModule->lookupValue(Ctx.getIdentifier(strippedName),
+    Ctx.TheBuiltinModule->lookupValue(accessPath,
+                                      Ctx.getIdentifier(strippedName),
                                       NLKind::QualifiedLookup,
                                       decls);
 

branches/master-rebranch/lib/AST/Builtins.cpp

@@ -1361,7 +1361,6 @@ Type IntrinsicTypeDecoder::decodeImmediate() {
   case IITDescriptor::HalfVecArgument:
   case IITDescriptor::VarArg:
   case IITDescriptor::Token:
-  case IITDescriptor::VecElementArgument:
   case IITDescriptor::VecOfAnyPtrsToElt:
     // These types cannot be expressed in swift yet.
     return Type();