---

yaml
---
r: 343278
b: refs/heads/master-rebranch
c: 0e3987a
h: refs/heads/master

Author: jckarter

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

branches/master-rebranch/cmake/modules/SwiftSource.cmake

@@ -229,7 +229,6 @@ function(_compile_swift_files
   # The standard library and overlays are always built resiliently.
   if(SWIFTFILE_IS_STDLIB)
     list(APPEND swift_flags "-enable-library-evolution")
-    list(APPEND swift_flags "-Xfrontend" "-enable-ownership-stripping-after-serialization")
   endif()
 
   if(SWIFT_STDLIB_USE_NONATOMIC_RC)

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

@@ -112,10 +112,6 @@ namespace swift {
 
   enum class KnownProtocolKind : uint8_t;
 
-namespace namelookup {
-  class ImportCache;
-}
-
 namespace syntax {
   class SyntaxArena;
 }
@@ -687,9 +683,7 @@ class ASTContext final {
   /// If there is no Clang module loader, returns a null pointer.
   /// The loader is owned by the AST context.
   ClangModuleLoader *getDWARFModuleLoader() const;
-
-  namelookup::ImportCache &getImportCache() const;
-
+  
   /// Asks every module loader to verify the ASTs it has loaded.
   ///
   /// Does nothing in non-asserts (NDEBUG) builds.
@@ -826,7 +820,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

@@ -27,10 +27,8 @@ SWIFT_TYPEID(CtorInitializerKind)
 SWIFT_TYPEID(ResilienceExpansion)
 SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>, PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(CustomAttr *, CustomAttr)
-SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
 SWIFT_TYPEID_NAMED(TypeAliasDecl *, TypeAliasDecl)
 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,34 +17,29 @@
 #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;
 struct TypePair;
 enum class AncestryFlags : uint8_t;
 
+#define SWIFT_AST_TYPEID_ZONE 1
+
 // Define the AST type zone (zone 1)
-#define SWIFT_TYPEID_ZONE AST
+#define SWIFT_TYPEID_ZONE SWIFT_AST_TYPEID_ZONE
 #define SWIFT_TYPEID_HEADER "swift/AST/ASTTypeIDZone.def"
 #include "swift/Basic/DefineTypeIDZone.h"
 

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

@@ -97,21 +97,24 @@ class DefaultAndMaxAccessLevelRequest :
   void cacheResult(DefaultAndMax value) const;
 };
 
-#define SWIFT_TYPEID_ZONE AccessControl
+/// The zone number for access-control requests.
+#define SWIFT_ACCESS_REQUESTS_TYPEID_ZONE 11
+
+#define SWIFT_TYPEID_ZONE SWIFT_ACCESS_REQUESTS_TYPEID_ZONE
 #define SWIFT_TYPEID_HEADER "swift/AST/AccessTypeIDZone.def"
 #include "swift/Basic/DefineTypeIDZone.h"
 #undef SWIFT_TYPEID_ZONE
 #undef SWIFT_TYPEID_HEADER
 
 // Set up reporting of evaluated requests.
-#define SWIFT_REQUEST(Zone, RequestType)                         \
+#define SWIFT_TYPEID(RequestType)                                \
 template<>                                                       \
 inline void reportEvaluatedRequest(UnifiedStatsReporter &stats,  \
                             const RequestType &request) {        \
   ++stats.getFrontendCounters().RequestType;                     \
 }
 #include "swift/AST/AccessTypeIDZone.def"
-#undef SWIFT_REQUEST
+#undef SWIFT_TYPEID
 
 } // end namespace swift
 

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

@@ -14,7 +14,6 @@
 //  TypeID zone, for use with the TypeID template.
 //
 //===----------------------------------------------------------------------===//
-
-SWIFT_REQUEST(AccessControl, AccessLevelRequest)
-SWIFT_REQUEST(AccessControl, DefaultAndMaxAccessLevelRequest)
-SWIFT_REQUEST(AccessControl, SetterAccessLevelRequest)
+SWIFT_TYPEID(AccessLevelRequest)
+SWIFT_TYPEID(SetterAccessLevelRequest)
+SWIFT_TYPEID(DefaultAndMaxAccessLevelRequest)

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

@@ -362,7 +362,8 @@ SIMPLE_DECL_ATTR(_weakLinked, WeakLinked,
   OnSubscript | OnConstructor | OnEnumElement | OnExtension | UserInaccessible,
   75)
 SIMPLE_DECL_ATTR(frozen, Frozen,
-  OnEnum | OnStruct,
+  OnEnum | OnStruct |
+  UserInaccessible,
   76)
 DECL_ATTR_ALIAS(_frozen, Frozen)
 SIMPLE_DECL_ATTR(_forbidSerializingReference, ForbidSerializingReference,

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

@@ -418,14 +418,6 @@ BUILTIN_MISC_OPERATION(Strideof, "strideof", "n", Special)
 /// IsPOD has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsPOD, "ispod", "n", Special)
 
-/// IsConcrete has type (T.Type) -> Bool
-///
-/// If the meta type T is concrete, we can always transform this to `true` at
-/// any time in SIL. If it's generic, then we lower it to `false` right before
-/// IRGen in IRGenPrepare. This allows for the optimizer to specialize this at
-/// -O and eliminate conditional code.
-BUILTIN_MISC_OPERATION(IsConcrete, "isConcrete", "n", Special)
-
 /// IsBitwiseTakable has type T.Type -> Bool
 BUILTIN_MISC_OPERATION(IsBitwiseTakable, "isbitwisetakable", "n", Special)
 

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,
@@ -5926,6 +5926,7 @@ class FuncDecl : public AbstractFunctionDecl {
 
   TypeLoc FnRetType;
 
+  OperatorDecl *Operator = nullptr;
   OpaqueTypeDecl *OpaqueReturn = nullptr;
 
 protected:
@@ -6072,7 +6073,13 @@ class FuncDecl : public AbstractFunctionDecl {
     return cast_or_null<FuncDecl>(AbstractFunctionDecl::getOverriddenDecl());
   }
 
-  OperatorDecl *getOperatorDecl() const;
+  OperatorDecl *getOperatorDecl() const {
+    return Operator;
+  }
+  void setOperatorDecl(OperatorDecl *o) {
+    assert(isOperator() && "can't set an OperatorDecl for a non-operator");
+    Operator = o;
+  }
 
   OpaqueTypeDecl *getOpaqueResultTypeDecl() const {
     return OpaqueReturn;
@@ -7248,17 +7255,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 +7268,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/DiagnosticsModuleDiffer.def

@@ -96,8 +96,6 @@ ERROR(decl_new_witness_table_entry,none,"%0 now requires %select{|no}1 new witne
 
 ERROR(new_decl_without_intro,none,"%0 is a new API without @available attribute", (StringRef))
 
-ERROR(objc_name_change,none,"%0 has ObjC name change from %1 to %2", (StringRef, StringRef, StringRef))
-
 #ifndef DIAG_NO_UNDEF
 # if defined(DIAG)
 #  undef DIAG

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

@@ -1836,16 +1836,16 @@ ERROR(protocol_access,none,
       "|private or fileprivate}4 because %select{it refines|its 'where' clause uses}2"
       "|%select{in this context|fileprivate|internal|public|%error}1 "
       "%select{protocol cannot refine|protocol's 'where' clause cannot use}2}0 "
-      "%select{a private|a fileprivate|an internal|%error|%error}3 %5",
-      (bool, AccessLevel, bool, AccessLevel, bool, DescriptiveDeclKind))
+      "%select{a private|a fileprivate|an internal|%error|%error}3 protocol",
+      (bool, AccessLevel, bool, AccessLevel, bool))
 WARNING(protocol_access_warn,none,
         "%select{protocol should be declared "
         "%select{private|fileprivate|internal|%error|%error}1 because "
         "%select{it refines|its 'where' clause uses}2"
         "|%select{in this context|fileprivate|internal|public|%error}1 "
         "%select{protocol should not refine|protocol's 'where' clause should not use}2}0 "
-        "%select{a private|a fileprivate|an internal|%error|%error}3 %5",
-        (bool, AccessLevel, bool, AccessLevel, bool, DescriptiveDeclKind))
+        "%select{a private|a fileprivate|an internal|%error|%error}3 protocol",
+        (bool, AccessLevel, bool, AccessLevel, bool))
 ERROR(protocol_usable_from_inline,none,
       "protocol %select{refined|used}0 by '@usableFromInline' protocol "
       "must be '@usableForInline' or public", (bool))

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

@@ -249,7 +249,7 @@ class Evaluator {
   ///
   /// These functions will be called to evaluate any requests within that
   /// zone.
-  void registerRequestFunctions(Zone zone,
+  void registerRequestFunctions(uint8_t zoneID,
                                 ArrayRef<AbstractRequestFunction *> functions);
 
   /// Evaluate the given request and produce its result,

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;