---

yaml
---
r: 315311
b: refs/heads/master-next
c: 433410f
h: refs/heads/master
i:
  315309: c33264c
  315307: 78a40cf
  315303: 74fcdc8
  315295: b83c635

Author: adrian-prantl

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3fe9333052029c114ef816ea805c335eb1ee8a99
-refs/heads/master-next: de0cfbd41f2c11861cec4387753547fdf3162894
+refs/heads/master-next: 433410f0a96ba2d5bd3a36bcc6eed43134d6ce05
 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/CMakeLists.txt

@@ -450,7 +450,7 @@ if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)
 endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL Darwin OR
-    EXISTS "${SWIFT_PATH_TO_LIBDISPATCH_SOURCE}")
+    EXISTS ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})
   set(SWIFT_BUILD_SYNTAXPARSERLIB_default TRUE)
   set(SWIFT_BUILD_SOURCEKIT_default TRUE)
 else()

branches/master-next/docs/DebuggingTheCompiler.rst

@@ -86,14 +86,6 @@ diagnostic engine to assert on the first error/warning:
 These allow one to dump a stack trace of where the diagnostic is being emitted
 (if run without a debugger) or drop into the debugger if a debugger is attached.
 
-Finding Diagnostic Names
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Some diagnostics rely heavily on format string arguments, so it can be difficult
-to find their implementation by searching for parts of the emitted message in
-the codebase. To print the corresponding diagnostic name at the end of each
-emitted message, use the ``-Xfrontend -debug-diagnostic-names`` argument.
-
 Debugging the Type Checker
 --------------------------
 

branches/master-next/docs/SIL.rst

@@ -2342,8 +2342,8 @@ assign_by_wrapper
   assign_by_wrapper %0 : $S to %1 : $*T, init %2 : $F, set %3 : $G
   // $S can be a value or address type
   // $T must be the type of a property wrapper.
-  // $F must be a function type, taking $S as a single argument (or multiple arguments in case of a tuple) and returning $T
-  // $G must be a function type, taking $S as a single argument (or multiple arguments in case of a tuple) and without a return value
+  // $F must be a function type, taking $S as a single argument and returning $T
+  // $G must be a function type, taking $S as a single argument and with not return value
 
 Similar to the ``assign`` instruction, but the assignment is done via a
 delegate.
@@ -3484,14 +3484,13 @@ has an escaping function type (not ``[on_stack]``) the closure context will be
 allocated with retain count 1 and initialized to contain the values ``%1``,
 ``%2``, etc.  The closed-over values will not be retained; that must be done
 separately before the ``partial_apply``. The closure does however take ownership
-of the partially applied arguments (except for ``@inout_aliasable`` parameters);
-when the closure reference count reaches zero, the contained values will be
-destroyed. If the ``partial_apply`` has a ``@noescape`` function type
-(``partial_apply [on_stack]``) the closure context is allocated on the stack and
-initialized to contain the closed-over values. The closed-over values are not
-retained, lifetime of the closed-over values must be managed separately. The
-lifetime of the stack context of a ``partial_apply [on_stack]`` must be
-terminated with a ``dealloc_stack``.
+of the partially applied arguments; when the closure reference count reaches
+zero, the contained values will be destroyed. If the ``partial_apply`` has a
+``@noescape`` function type (``partial_apply [on_stack]``) the closure context
+is allocated on the stack and initialized to contain the closed-over values. The
+closed-over values are not retained, lifetime of the closed-over values must be
+managed separately. The lifetime of the stack context of a ``partial_apply
+[on_stack]`` must be terminated with a ``dealloc_stack``.
 
 If the callee is generic, all of its generic parameters must be bound by the
 given substitution list. The arguments are given with these generic
@@ -3500,11 +3499,6 @@ type with the given substitutions applied. The generic parameters themselves
 cannot be partially applied; all of them must be bound. The result is always
 a concrete function.
 
-If an address argument has ``@inout_aliasable`` convention, the closure
-obtained from ``partial_apply`` will not own its underlying value.
-The ``@inout_aliasable`` parameter convention is used when a ``@noescape``
-closure captures an ``inout`` argument.
-
 TODO: The instruction, when applied to a generic function,
 currently implicitly performs abstraction difference transformations enabled
 by the given substitutions, such as promoting address-only arguments and returns

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

@@ -829,6 +829,10 @@ class ASTContext final {
   /// \param IDC The context whose member decls should be lazily parsed.
   void parseMembers(IterableDeclContext *IDC);
 
+  /// Use the lazy parsers associated with the context to check whether the decl
+  /// context has been parsed.
+  bool hasUnparsedMembers(const IterableDeclContext *IDC) const;
+
   /// Get the lazy function data for the given generic context.
   ///
   /// \param lazyLoader If non-null, the lazy loader to use when creating the

branches/master-next/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-next/include/swift/AST/Attr.h

@@ -101,10 +101,10 @@ class TypeAttributes {
     AttrLocs[A] = L;
   }
 
-  void getAttrLocs(SmallVectorImpl<SourceLoc> &Locs) const {
+  void getAttrRanges(SmallVectorImpl<SourceRange> &Ranges) const {
     for (auto Loc : AttrLocs) {
       if (Loc.isValid())
-        Locs.push_back(Loc);
+        Ranges.push_back(Loc);
     }
   }
 

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

@@ -556,9 +556,13 @@ class alignas(1 << DeclAlignInBits) Decl {
 
     /// \see ClassDecl::ForeignKind
     RawForeignKind : 2,
-
-    /// \see ClassDecl::getEmittedMembers()
-    HasForcedEmittedMembers : 1,
+    
+    /// Whether this class contains a destructor decl.
+    ///
+    /// A fully type-checked class always contains a destructor member, even if
+    /// it is implicit. This bit is used during parsing and type-checking to
+    /// control inserting the implicit destructor.
+    HasDestructorDecl : 1,
 
     /// Information about the class's ancestry.
     Ancestry : 7,
@@ -3761,17 +3765,8 @@ class ClassDecl final : public NominalTypeDecl {
     llvm::PointerIntPair<Type, 1, bool> SuperclassType;
   } LazySemanticInfo;
 
-  bool hasForcedEmittedMembers() const {
-    return Bits.ClassDecl.HasForcedEmittedMembers;
-  }
-
-  void setHasForcedEmittedMembers() {
-    Bits.ClassDecl.HasForcedEmittedMembers = true;
-  }
-
   friend class SuperclassDeclRequest;
   friend class SuperclassTypeRequest;
-  friend class EmittedMembersRequest;
   friend class TypeChecker;
 
 public:
@@ -3919,9 +3914,23 @@ class ClassDecl final : public NominalTypeDecl {
   /// either from a class itself or its direct or indirect superclasses.
   AbstractFunctionDecl *findImplementingMethod(
       const AbstractFunctionDecl *method) const;
+
+  /// True if the class has a destructor.
+  ///
+  /// Fully type-checked classes always contain destructors, but during parsing
+  /// or type-checking, the implicit destructor may not have been synthesized
+  /// yet if one was not explicitly declared.
+  bool hasDestructor() const { return Bits.ClassDecl.HasDestructorDecl; }
+
+  /// Set the 'has destructor' flag.
+  void setHasDestructor() { Bits.ClassDecl.HasDestructorDecl = 1; }
 
   /// Retrieve the destructor for this class.
-  DestructorDecl *getDestructor() const;
+  DestructorDecl *getDestructor();
+
+  /// Synthesize implicit, trivial destructor, add it to this ClassDecl
+  /// and return it.
+  void addImplicitDestructor();
 
   /// Determine whether this class inherits the convenience initializers
   /// from its superclass.
@@ -3984,10 +3993,6 @@ class ClassDecl final : public NominalTypeDecl {
   /// Record the presence of an @objc method with the given selector.
   void recordObjCMethod(AbstractFunctionDecl *method, ObjCSelector selector);
 
-  /// Get all the members of this class, synthesizing any implicit members
-  /// that appear in the vtable if needed.
-  DeclRange getEmittedMembers() const;
-
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::Class;
@@ -4795,7 +4800,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-next/include/swift/AST/DeclContext.h

@@ -459,10 +459,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   /// are used.
   ResilienceExpansion getResilienceExpansion() const;
 
-  /// Returns true if this context may possibly contain members visible to
-  /// AnyObject dynamic lookup.
-  bool mayContainMembersAccessedByDynamicLookup() const;
-
   /// Returns true if lookups within this context could affect downstream files.
   ///
   /// \param functionsAreNonCascading If true, functions are considered non-
@@ -701,18 +697,7 @@ class IterableDeclContext {
   /// detect when a member has been added. A bit would suffice,
   /// but would be more fragile, The scope code could count the members each
   /// time, but I think it's a better trade to just keep a count here.
-  unsigned MemberCount : 29;
-
-  /// 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.
-  unsigned HasOperatorDeclarations : 1;
-
-  /// Whether delayed parsing detect a possible nested class definition
-  /// while skipping the body of this context.
-  unsigned HasNestedClassDeclarations : 1;
+  unsigned memberCount = 0;
 
   template<class A, class B, class C>
   friend struct ::llvm::cast_convert_val;
@@ -724,44 +709,13 @@ class IterableDeclContext {
 
 public:
   IterableDeclContext(IterableDeclContextKind kind)
-    : LastDeclAndKind(nullptr, kind) {
-    MemberCount = 0;
-    HasOperatorDeclarations = 0;
-    HasUnparsedMembers = 0;
-    HasNestedClassDeclarations = 0;
-  }
+    : LastDeclAndKind(nullptr, kind) { }
 
   /// Determine the kind of iterable context we have.
   IterableDeclContextKind getIterableContextKind() const {
     return LastDeclAndKind.getInt();
   }
 
-  bool hasUnparsedMembers() const {
-    return HasUnparsedMembers;
-  }
-
-  void setHasUnparsedMembers() {
-    HasUnparsedMembers = 1;
-  }
-
-  bool maybeHasOperatorDeclarations() const {
-    return HasOperatorDeclarations;
-  }
-
-  void setMaybeHasOperatorDeclarations() {
-    assert(hasUnparsedMembers());
-    HasOperatorDeclarations = 1;
-  }
-
-  bool maybeHasNestedClassDeclarations() const {
-    return HasNestedClassDeclarations;
-  }
-
-  void setMaybeHasNestedClassDeclarations() {
-    assert(hasUnparsedMembers());
-    HasNestedClassDeclarations = 1;
-  }
-
   /// Retrieve the set of members in this context.
   DeclRange getMembers() const;
 
@@ -774,8 +728,8 @@ class IterableDeclContext {
   /// is inserted immediately after the hint.
   void addMember(Decl *member, Decl *hint = nullptr);
 
-  /// See \c MemberCount
-  unsigned getMemberCount() const { return MemberCount; }
+  /// See \c memberCount
+  unsigned getMemberCount() const { return memberCount; }
 
   /// Check whether there are lazily-loaded members.
   bool hasLazyMembers() const {

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

@@ -583,9 +583,6 @@ namespace swift {
     /// input being compiled.
     /// May be invalid.
     SourceLoc bufferIndirectlyCausingDiagnostic;
-    
-    /// Print diagnostic names after their messages
-    bool printDiagnosticNames = false;
 
     friend class InFlightDiagnostic;
     friend class DiagnosticTransaction;
@@ -621,14 +618,6 @@ namespace swift {
       return state.getWarningsAsErrors();
     }
 
-    /// Whether to print diagnostic names after their messages
-    void setPrintDiagnosticNames(bool val) {
-      printDiagnosticNames = val;
-    }
-    bool getPrintDiagnosticNames() const {
-      return printDiagnosticNames;
-    }
-
     void ignoreDiagnostic(DiagID id) {
       state.setDiagnosticBehavior(id, DiagnosticState::Behavior::Ignore);
     }
@@ -837,8 +826,7 @@ namespace swift {
     void emitTentativeDiagnostics();
 
   public:
-    static const char *diagnosticStringFor(const DiagID id,
-                                           bool printDiagnosticName);
+    static const char *diagnosticStringFor(const DiagID id);
 
     /// If there is no clear .dia file for a diagnostic, put it in the one
     /// corresponding to the SourceLoc given here.

branches/master-next/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-next/include/swift/AST/DiagnosticsParse.def

@@ -163,7 +163,7 @@ ERROR(lex_illegal_multiline_string_end,none,
       "multi-line string literal closing delimiter must begin on a new line", ())
 ERROR(lex_multiline_string_indent_inconsistent,none,
       "%select{unexpected space in|unexpected tab in|insufficient}2 indentation of "
-      "%select{line|next %1 lines}0 in multi-line string literal",
+      "%select{line|next %1 lines}0 in multi-line string literal", 
       (bool, unsigned, unsigned))
 NOTE(lex_multiline_string_indent_should_match_here,none,
       "should match %select{space|tab}0 here", (unsigned))
@@ -252,7 +252,7 @@ ERROR(cskeyword_not_attribute,none,
       "'%0' is a declaration modifier, not an attribute", (StringRef))
 
 ERROR(decl_already_static,none,
-      "%0 cannot appear after another 'static' or 'class' keyword", (StaticSpellingKind))
+      "%0 specified twice", (StaticSpellingKind))
 
 ERROR(enum_case_dot_prefix,none,
       "extraneous '.' in enum 'case' declaration", ())
@@ -881,7 +881,7 @@ WARNING(parameter_extraneous_double_up,none,
         "extraneous duplicate parameter name; %0 already has an argument "
         "label", (Identifier))
 ERROR(parameter_operator_keyword_argument,none,
-      "%select{operator|closure|enum case}0 cannot have keyword arguments",
+      "%select{operator|closure|enum case}0 cannot have keyword arguments", 
       (unsigned))
 
 ERROR(parameter_unnamed,none,

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

@@ -81,13 +81,6 @@ ERROR(could_not_find_value_member,none,
 ERROR(could_not_find_value_member_corrected,none,
       "value of type %0 has no member %1; did you mean %2?",
       (Type, DeclName, DeclName))
-ERROR(could_not_find_value_dynamic_member_corrected,none,
-      "value of type %0 has no dynamic member %2 using key path from root type %1; did you mean %3?",
-      (Type, Type, DeclName, DeclName))
-ERROR(could_not_find_value_dynamic_member,none,
-      "value of type %0 has no dynamic member %2 using key path from root type %1",
-      (Type, Type, DeclName))
-
 ERROR(could_not_find_type_member,none,
       "type %0 has no member %1", (Type, DeclName))
 ERROR(could_not_find_type_member_corrected,none,
@@ -3400,18 +3393,6 @@ ERROR(pattern_type_mismatch_context,none,
 
 ERROR(tuple_pattern_in_non_tuple_context,none,
       "tuple pattern cannot match values of the non-tuple type %0", (Type))
-WARNING(matching_pattern_with_many_assoc_values, none,
-        "cannot match several associated values at once, "
-        "implicitly tupling the associated values and trying to match that "
-        "instead", ())
-WARNING(matching_tuple_pattern_with_many_assoc_values,none,
-        "a tuple pattern cannot match several associated values at once, "
-        "implicitly tupling the associated values and trying to match "
-        "that instead", ())
-WARNING(matching_many_patterns_with_tupled_assoc_value,none,
-        "the enum case has a single tuple as an associated value, but "
-        "there are several patterns here, implicitly tupling the patterns "
-        "and trying to match that instead", ())
 ERROR(closure_argument_list_tuple,none,
       "contextual closure type %0 expects %1 argument%s1, "
       "but %2 %select{were|was}3 used in closure body", (Type, unsigned, unsigned, bool))