---

yaml
---
r: 275446
b: refs/heads/master-next
c: 04770f6
h: refs/heads/master

Author: ravikandhadai

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 65b3164726f2e62dff31e90a5cb5e3fb67cc82bf
-refs/heads/master-next: 74d1322a727ac903bf518fa79fdab5221bb3274c
+refs/heads/master-next: 04770f6124fef4adae5b86bc4dc4650585b0a44e
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/CHANGELOG.md

@@ -6,7 +6,6 @@ CHANGELOG
 
 | Contents               |
 | :--------------------- |
-| [Swift 5.1](#swift-51) |
 | [Swift 5.0](#swift-50) |
 | [Swift 4.2](#swift-42) |
 | [Swift 4.1](#swift-41) |
@@ -27,17 +26,6 @@ Swift 5.1
 
 * Key path expressions can now include references to tuple elements.
 
-* Single-parameter functions accepting values of type `Any` are no
-  longer preferred over other functions.
-
-  ```swift
-  func foo(_: Any) { print("Any") }
-  func foo<T>(_: T) { print("T") }
-  foo(0) // prints "Any" in Swift < 5.1, "T" in Swift 5.1
-  ```
-
-**Add new entries to the top of this section, not here!**
-
 Swift 5.0
 ---------
 

branches/master-next/CMakeLists.txt

@@ -235,8 +235,8 @@ option(SWIFT_RUNTIME_CRASH_REPORTER_CLIENT
     FALSE)
 
 option(SWIFT_DARWIN_ENABLE_STABLE_ABI_BIT
-    "Enable the Swift stable ABI's class marker bit for new deployment targets"
-    TRUE)
+    "Enable the Swift stable ABI's class marker bit"
+    FALSE)
 
 set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
     "The name of the toolchain to pass to 'xcrun'")

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

@@ -262,7 +262,7 @@ function(_compile_swift_files
   if (SWIFTFILE_IS_STDLIB)
     list(APPEND swift_flags "-swift-version" "5")
   endif()
-
+  
   # Force swift 4 compatibility mode for overlays.
   if (SWIFTFILE_IS_SDK_OVERLAY)
     list(APPEND swift_flags "-swift-version" "4")
@@ -344,11 +344,16 @@ function(_compile_swift_files
     list(APPEND module_outputs "${interface_file}")
   endif()
 
+  set(optional_arg)
+  if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)
+    # Allow installation of stdlib without building all variants on Darwin.
+    set(optional_arg "OPTIONAL")
+  endif()
+
   if(SWIFTFILE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)
     swift_install_in_component("${SWIFTFILE_INSTALL_IN_COMPONENT}"
       DIRECTORY "${specific_module_dir}"
-      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}"
-      OPTIONAL)
+      DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${library_subdir}")
   else()
     swift_install_in_component("${SWIFTFILE_INSTALL_IN_COMPONENT}"
       FILES ${module_outputs}
@@ -434,7 +439,7 @@ function(_compile_swift_files
   set(file_path "${CMAKE_CURRENT_BINARY_DIR}/${file_name}.txt")
   string(REPLACE ";" "'\n'" source_files_quoted "${source_files}")
   file(WRITE "${file_path}" "'${source_files_quoted}'")
-
+  
   # If this platform/architecture combo supports backward deployment to old
   # Objective-C runtimes, we need to copy a YAML file with legacy type layout
   # information to the build directory so that the compiler can find it.

branches/master-next/docs/SIL.rst

@@ -4311,7 +4311,7 @@ open_existential_addr
   //   type P
   // $*@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $*@opened P
+  // %1 will be of type $*P
 
 Obtains the address of the concrete value inside the existential
 container referenced by ``%0``. The protocol conformances associated
@@ -4334,7 +4334,7 @@ open_existential_value
   //   type P
   // $@opened P must be a unique archetype that refers to an opened
   // existential type P.
-  // %1 will be of type $@opened P
+  // %1 will be of type $P
 
 Loadable version of the above: Opens-up the existential
 container associated with ``%0``. The protocol conformances associated

branches/master-next/include/swift/ABI/Metadata.h

@@ -1192,31 +1192,6 @@ struct TargetClassMetadata : public TargetAnyClassMetadata<Runtime> {
     return bounds;
   }
 
-  /// Given a statically-emitted metadata template, this sets the correct
-  /// "is Swift" bit for the current runtime. Depending on the deployment
-  /// target a binary was compiled for, statically emitted metadata templates
-  /// may have a different bit set from the one that this runtime canonically
-  /// considers the "is Swift" bit.
-  void setAsTypeMetadata() {
-    // If the wrong "is Swift" bit is set, set the correct one.
-    //
-    // Note that the only time we should see the "new" bit set while
-    // expecting the "old" one is when running a binary built for a
-    // new OS on an old OS, which is not supported, however we do
-    // have tests that exercise this scenario.
-    auto otherSwiftBit = (3ULL - SWIFT_CLASS_IS_SWIFT_MASK);
-    assert(otherSwiftBit == 1ULL || otherSwiftBit == 2ULL);
-
-    if ((this->Data & 3) == otherSwiftBit) {
-      this->Data ^= 3;
-    }
-
-    // Otherwise there should be nothing to do, since only the old "is
-    // Swift" bit is used for backward-deployed runtimes.
-    
-    assert(isTypeMetadata());
-  }
-
   static bool classof(const TargetMetadata<Runtime> *metadata) {
     return metadata->getKind() == MetadataKind::Class;
   }

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

@@ -901,8 +901,6 @@ WARNING(is_expr_same_type,none,
         "'!= nil'?", (Type, Type))
 WARNING(downcast_to_unrelated,none,
         "cast from %0 to unrelated type %1 always fails", (Type, Type))
-NOTE(downcast_to_unrelated_fixit,none,
-     "did you mean to call %0 with '()'?", (Identifier))
 ERROR(downcast_to_more_optional,none,
       "cannot downcast from %0 to a more optional type %1",
       (Type, Type))

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

@@ -935,6 +935,11 @@ class GenericSignatureBuilder::RequirementSource final
     AssociatedTypeDecl,
   };
 
+  /// Cache DependentMemberType results instead of calling
+  /// DependentMemberType::get(). The much smaller hash table is more
+  /// processor cache efficient.
+  mutable llvm::DenseMap<Type, Type> ReplacedSelfCache;
+
   /// The kind of storage we have.
   const StorageKind storageKind;
 
@@ -954,8 +959,9 @@ class GenericSignatureBuilder::RequirementSource final
     /// A protocol conformance used to satisfy the requirement.
     void *conformance;
 
-    /// An associated type to which a requirement is being applied.
-    AssociatedTypeDecl *assocType;
+    /// A precomputed dependent member of an associated type to which a
+    /// requirement is being applied.
+    DependentMemberType *dependentMember;
   } storage;
 
   friend TrailingObjects;
@@ -1093,7 +1099,8 @@ class GenericSignatureBuilder::RequirementSource final
     assert(isAcceptableStorageKind(kind, storageKind) &&
            "RequirementSource kind/storageKind mismatch");
 
-    storage.assocType = assocType;
+    auto ty = assocType->getDeclaredInterfaceType();
+    storage.dependentMember = cast<DependentMemberType>(ty.getPointer());
   }
 
   RequirementSource(Kind kind, const RequirementSource *parent)
@@ -1315,11 +1322,18 @@ class GenericSignatureBuilder::RequirementSource final
     return ProtocolConformanceRef::getFromOpaqueValue(storage.conformance);
   }
 
+  /// Retrieve the precomputed dependent member for the associated type
+  /// declaration for this requirement, if there is one.
+  DependentMemberType *getDependentMember() const {
+    if (storageKind != StorageKind::AssociatedTypeDecl) return nullptr;
+    return storage.dependentMember;
+  }
+
   /// Retrieve the associated type declaration for this requirement, if there
   /// is one.
   AssociatedTypeDecl *getAssociatedType() const {
     if (storageKind != StorageKind::AssociatedTypeDecl) return nullptr;
-    return storage.assocType;
+    return storage.dependentMember->getAssocType();
   }
 
   /// Profiling support for \c FoldingSet.
@@ -1558,6 +1572,11 @@ class GenericSignatureBuilder::PotentialArchetype {
   /// that share a name.
   llvm::MapVector<Identifier, StoredNestedType> NestedTypes;
 
+  /// Cache DependentMemberType results instead of calling
+  /// DependentMemberType::get(). The much smaller hash table is more
+  /// processor cache efficient.
+  mutable llvm::DenseMap<Type, DependentMemberType*> CachedDMTs;
+
   /// Construct a new potential archetype for a concrete declaration.
   PotentialArchetype(PotentialArchetype *parent, AssociatedTypeDecl *assocType)
       : parentOrContext(parent), identifier(assocType) {
@@ -1597,6 +1616,14 @@ class GenericSignatureBuilder::PotentialArchetype {
     return identifier.assocType;
   }
 
+  /// Retrieve the type declaration to which this nested type was resolved.
+  DependentMemberType *getResolvedDependentMemberType(Type Parent) const {
+    auto *&known = CachedDMTs[Parent];
+    if (!known)
+      known = DependentMemberType::get(Parent, getResolvedType());
+    return known;
+  }
+
   /// Determine whether this is a generic parameter.
   bool isGenericParam() const {
     return parentOrContext.is<ASTContext *>();

branches/master-next/include/swift/AST/Types.h

@@ -2241,7 +2241,7 @@ class NominalType : public NominalOrBoundGenericNominalType {
 DEFINE_EMPTY_CAN_TYPE_WRAPPER(NominalType, NominalOrBoundGenericNominalType)
 
 /// EnumType - This represents the type declared by an EnumDecl.
-class EnumType : public NominalType {
+class EnumType : public NominalType, public llvm::FoldingSetNode {
 public:
   /// getDecl() - Returns the decl which declares this type.
   EnumDecl *getDecl() const {
@@ -2252,6 +2252,11 @@ class EnumType : public NominalType {
   /// declaration in the parent type \c Parent.
   static EnumType *get(EnumDecl *D, Type Parent, const ASTContext &C);
 
+  void Profile(llvm::FoldingSetNodeID &ID) {
+    Profile(ID, getDecl(), getParent());
+  }
+  static void Profile(llvm::FoldingSetNodeID &ID, EnumDecl *D, Type Parent);
+
   // Implement isa/cast/dyncast/etc.
   static bool classof(const TypeBase *T) {
     return T->getKind() == TypeKind::Enum;
@@ -2264,7 +2269,7 @@ class EnumType : public NominalType {
 DEFINE_EMPTY_CAN_TYPE_WRAPPER(EnumType, NominalType)
 
 /// StructType - This represents the type declared by a StructDecl.
-class StructType : public NominalType {
+class StructType : public NominalType, public llvm::FoldingSetNode {  
 public:
   /// getDecl() - Returns the decl which declares this type.
   StructDecl *getDecl() const {
@@ -2275,6 +2280,11 @@ class StructType : public NominalType {
   /// declaration in the parent type \c Parent.
   static StructType *get(StructDecl *D, Type Parent, const ASTContext &C);
 
+  void Profile(llvm::FoldingSetNodeID &ID) {
+    Profile(ID, getDecl(), getParent());
+  }
+  static void Profile(llvm::FoldingSetNodeID &ID, StructDecl *D, Type Parent);
+
   // Implement isa/cast/dyncast/etc.
   static bool classof(const TypeBase *T) {
     return T->getKind() == TypeKind::Struct;
@@ -2287,7 +2297,7 @@ class StructType : public NominalType {
 DEFINE_EMPTY_CAN_TYPE_WRAPPER(StructType, NominalType)
 
 /// ClassType - This represents the type declared by a ClassDecl.
-class ClassType : public NominalType {
+class ClassType : public NominalType, public llvm::FoldingSetNode {  
 public:
   /// getDecl() - Returns the decl which declares this type.
   ClassDecl *getDecl() const {
@@ -2298,6 +2308,11 @@ class ClassType : public NominalType {
   /// declaration in the parent type \c Parent.
   static ClassType *get(ClassDecl *D, Type Parent, const ASTContext &C);
 
+  void Profile(llvm::FoldingSetNodeID &ID) {
+    Profile(ID, getDecl(), getParent());
+  }
+  static void Profile(llvm::FoldingSetNodeID &ID, ClassDecl *D, Type Parent);
+
   // Implement isa/cast/dyncast/etc.
   static bool classof(const TypeBase *T) {
     return T->getKind() == TypeKind::Class;
@@ -4328,7 +4343,7 @@ class DictionaryType : public SyntaxSugarType {
 
 /// ProtocolType - A protocol type describes an abstract interface implemented
 /// by another type.
-class ProtocolType : public NominalType {
+class ProtocolType : public NominalType, public llvm::FoldingSetNode {
 public:
   /// Retrieve the type when we're referencing the given protocol.
   /// declaration.
@@ -4361,6 +4376,11 @@ class ProtocolType : public NominalType {
   static bool visitAllProtocols(ArrayRef<ProtocolDecl *> protocols,
                                 llvm::function_ref<bool(ProtocolDecl *)> fn);
 
+  void Profile(llvm::FoldingSetNodeID &ID) {
+    Profile(ID, getDecl(), getParent());
+  }
+  static void Profile(llvm::FoldingSetNodeID &ID, ProtocolDecl *D, Type Parent);
+
 private:
   friend class NominalTypeDecl;
   ProtocolType(ProtocolDecl *TheDecl, Type Parent, const ASTContext &Ctx,

branches/master-next/include/swift/Basic/Mangler.h

@@ -78,14 +78,6 @@ class Mangler {
     }
   };
 
-  void addSubstWordsInIdent(const WordReplacement &repl) {
-    SubstWordsInIdent.push_back(repl);
-  }
-
-  void addWord(const SubstitutionWord &word) {
-    Words.push_back(word);
-  }
-
   /// Returns the buffer as a StringRef, needed by mangleIdentifier().
   StringRef getBufferStr() const {
     return StringRef(Storage.data(), Storage.size());

branches/master-next/include/swift/Demangling/Demangle.h

@@ -490,23 +490,23 @@ void mangleIdentifier(const char *data, size_t length,
                       bool usePunycode = true);
 
 /// Remangle a demangled parse tree.
-std::string mangleNode(NodePointer root);
+///
+/// If \p BorrowFrom is specified, the initial bump pointer memory is
+/// borrowed from the free memory of BorrowFrom.
+std::string mangleNode(NodePointer root,
+                       NodeFactory *BorrowFrom = nullptr);
 
 using SymbolicResolver =
   llvm::function_ref<Demangle::NodePointer (SymbolicReferenceKind,
                                             const void *)>;
 
-/// Remangle a demangled parse tree, using a callback to resolve
-/// symbolic references.
-std::string mangleNode(NodePointer root, SymbolicResolver resolver);
-
 /// Remangle a demangled parse tree, using a callback to resolve
 /// symbolic references.
 ///
-/// The returned string is owned by \p Factory. This means \p Factory must stay
-/// alive as long as the returned string is used.
-llvm::StringRef mangleNode(NodePointer root, SymbolicResolver resolver,
-                           NodeFactory &Factory);
+/// If \p BorrowFrom is specified, the initial bump pointer memory is
+/// borrowed from the free memory of BorrowFrom.
+std::string mangleNode(NodePointer root, SymbolicResolver resolver,
+                       NodeFactory *BorrowFrom = nullptr);
 
 /// Remangle in the old mangling scheme.
 ///

branches/master-next/include/swift/Demangling/Demangler.h

@@ -279,11 +279,7 @@ template<typename T> class Vector {
     Capacity = 0;
     Elems = 0;
   }
-
-  void clear() {
-    NumElems = 0;
-  }
-
+  
   iterator begin() { return Elems; }
   iterator end() { return Elems + NumElems; }
 
@@ -303,11 +299,6 @@ template<typename T> class Vector {
 
   T &back() { return (*this)[NumElems - 1]; }
 
-  void resetSize(size_t toPos) {
-    assert(toPos <= NumElems);
-    NumElems = toPos;
-  }
-
   void push_back(const T &NewElem, NodeFactory &Factory) {
     if (NumElems >= Capacity)
       Factory.Reallocate(Elems, Capacity, /*Growth*/ 1);
@@ -336,9 +327,6 @@ class CharVector : public Vector<char> {
   // Append an integer as readable number.
   void append(int Number, NodeFactory &Factory);
 
-  // Append an unsigned 64 bit integer as readable number.
-  void append(unsigned long long Number, NodeFactory &Factory);
-
   StringRef str() const {
     return StringRef(Elems, NumElems);
   }