---

yaml
---
r: 344031
b: refs/heads/master-rebranch
c: 039f67b
h: refs/heads/master
i:
  344029: f6eb1ad
  344027: 7be9b55
  344023: 964f1a9
  344015: 455f961
  343999: 5584e73

Author: compnerd

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

branches/master-rebranch/CHANGELOG.md

@@ -26,63 +26,6 @@ CHANGELOG
 Swift Next
 ----------
 
-* [SR-11298][]:
-
-  A class-constrained protocol extension, where the extended protocol does
-  not impose a class constraint, will now infer the constraint implicitly.
-
-  ```swift
-  protocol Foo {}
-  class Bar: Foo {
-    var someProperty: Int = 0
-  }
-
-  // Even though 'Foo' does not impose a class constraint, it is automatically
-  // inferred due to the Self: Bar constraint.
-  extension Foo where Self: Bar {
-    var anotherProperty: Int {
-      get { return someProperty }
-      // As a result, the setter is now implicitly nonmutating, just like it would
-      // be if 'Foo' had a class constraint.
-      set { someProperty = newValue }
-    }
-  }
-  ```
-  
-  As a result, this could lead to code that currently compiles today to throw an error.
-  
-  ```swift
-  protocol Foo {
-    var someProperty: Int { get set }
-  }
-  
-  class Bar: Foo {
-    var someProperty = 0
-  }
-  
-  extension Foo where Self: Bar {
-    var anotherProperty1: Int {
-      get { return someProperty }
-      // This will now error, because the protocol requirement
-      // is implicitly mutating and the setter is implicitly 
-      // nonmutating.
-      set { someProperty = newValue } // Error
-    }
-  }
-  ```
-
-  **Workaround**: Define a new mutable variable inside the setter that has a reference to `self`:
-  
-  ```swift
-  var anotherProperty1: Int {
-    get { return someProperty }
-    set {
-      var mutableSelf = self
-      mutableSelf.someProperty = newValue // Okay
-    }
-  }
-```
-
 * [SE-0253][]:
 
   Values of types that declare `func callAsFunction` methods can be called
@@ -108,7 +51,7 @@ Swift Next
 
 * [SR-4206][]:
 
-  A method override is no longer allowed to have a generic signature with
+  A method override is no longer allowed to have a generic signature with 
   requirements not imposed by the base method. For example:
 
   ```
@@ -7822,4 +7765,3 @@ Swift 1.0
 [SR-8974]: <https://bugs.swift.org/browse/SR-8974>
 [SR-9043]: <https://bugs.swift.org/browse/SR-9043>
 [SR-9827]: <https://bugs.swift.org/browse/SR-9827>
-[SR-11298]: <https://bugs.swift.org/browse/SR-11298>

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/Builtins.def

@@ -75,8 +75,6 @@ BUILTIN_BINARY_OPERATION(ExactUDiv, "udiv_exact", "n", IntegerOrVector)
 BUILTIN_BINARY_OPERATION(URem,    "urem",     "n", Integer)
 BUILTIN_BINARY_OPERATION(FRem,    "frem",     "n", FloatOrVector)
 BUILTIN_BINARY_OPERATION(Xor,     "xor",      "n", IntegerOrVector)
-// This builtin is an optimizer hint and always returns the first argument.
-BUILTIN_BINARY_OPERATION(Expect, "int_expect", "n", Integer)
 #undef BUILTIN_BINARY_OPERATION
 
 /// These builtins are analogous the similarly named llvm intrinsics. The

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

@@ -261,10 +261,7 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
 
   /// Returns the kind of context this is.
   DeclContextKind getContextKind() const;
-
-  /// Returns whether this context has value semantics.
-  bool hasValueSemantics() const;
-
+  
   /// Determines whether this context is itself a local scope in a
   /// code block.  A context that appears in such a scope, like a
   /// local type declaration, does not itself become a local context.

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/DiagnosticsSIL.def

@@ -360,75 +360,61 @@ ERROR(pound_assert_failure,none,
 NOTE(constexpr_unknown_reason_default,none,
     "cannot evaluate expression as constant here", ())
 NOTE(constexpr_unevaluable_operation,none,
-    "cannot constant evaluate operation%select{| used by this call}0", (bool))
+    "cannot constant evaluate operation", ())
 
 NOTE(constexpr_too_many_instructions,none,
      "exceeded instruction limit: %0 when evaluating the expression "
      "at compile time", (unsigned))
-NOTE(constexpr_limit_exceeding_instruction,none, "limit exceeded "
-     "%select{here|during this call}0", (bool))
+NOTE(constexpr_limit_exceeding_instruction,none, "limit exceeded here", ())
 
 NOTE(constexpr_loop_found_note,none,
     "control-flow loop found during evaluation ", ())
-NOTE(constexpr_loop_instruction,none, "found loop "
-    "%select{here|inside this call}0", (bool))
+NOTE(constexpr_loop_instruction,none, "found loop here", ())
 
 NOTE(constexpr_overflow,none, "integer overflow detected", ())
-NOTE(constexpr_overflow_operation,none, "operation"
-     "%select{| performed during this call}0 overflows", (bool))
+NOTE(constexpr_overflow_operation,none, "operation overflows", ())
 
 NOTE(constexpr_trap,none, "trap detected", ())
-NOTE(constexpr_trap_operation,none, "operation"
-     "%select{| performed during this call}0 traps", (bool))
-
-NOTE(constexpr_assertion_failed, none, "assertion failed with message: %0",
-    (StringRef))
-NOTE(constexpr_assertion_failed_here, none, "assertion failed"
-     "%select{ here| during this call}0 ", (bool))
+NOTE(constexpr_trap_operation,none, "operation traps", ())
 
 NOTE(constexpr_invalid_operand_seen, none,
     "operation with invalid operands encountered during evaluation",())
 NOTE(constexpr_operand_invalid_here, none,
-    "operation with invalid operands encountered "
-    "%select{here|during this call}0", (bool))
+    "operation with invalid operands encountered here",())
 
 NOTE(constexpr_value_unknown_at_top_level,none,
     "cannot evaluate top-level value as constant here",())
 NOTE(constexpr_multiple_writers_found_at_top_level,none,
      "top-level value has multiple assignments",())
 
 NOTE(constexpr_unsupported_instruction_found, none,
-    "encountered operation not supported by the evaluator: %0", (StringRef))
-NOTE(constexpr_unsupported_instruction_found_here,none, "operation"
-     "%select{| used by this call is}0 not supported by the evaluator", (bool))
+    "encountered operation not supported by the evaluator", ())
+NOTE(constexpr_unsupported_instruction_found_here,none,
+    "operation not supported by the evaluator", ())
 
 NOTE(constexpr_unknown_function_called, none,
-    "encountered call to '%0' whose body is not available", (StringRef))
+    "encountered call to a function whose body is not available", ())
 NOTE(constexpr_unknown_function_called_here, none,
-    "%select{|calls a }0function whose body is not available", (bool))
+    "call to a function whose body is not available", ())
 
 NOTE(constexpr_untracked_sil_value_use_found, none,
     "encountered use of a variable not tracked by the evaluator", ())
 NOTE(constexpr_untracked_sil_value_used_here, none,
-    "untracked variable used %select{here|by this call}0", (bool))
-
-NOTE(constexpr_unresolvable_witness_call, none,
-    "encountered unresolvable witness method call: '%0'", (StringRef))
-NOTE(constexpr_no_witness_table_entry, none, "cannot find witness table entry "
-    "%select{for this call|for a witness-method invoked during this call}0",
-    (bool))
-NOTE(constexpr_witness_call_with_no_conformance, none,
-    "cannot find concrete conformance "
-    "%select{for this call|for a witness-method invoked during this call}0",
-    (bool))
+    "untracked variable used here", ())
+
+NOTE(constexpr_witness_call_with_no_conformance_found, none,
+    "cannot find concrete conformance for a witness method call", ())
+NOTE(constexpr_witness_call_with_no_target_found, none,
+    "cannot resolve a witness method call to a concrete function", ())
+NOTE(constexpr_witness_call_found_here, none,
+    "witness method call found here", ())
 
 NOTE(constexpr_unknown_control_flow_due_to_skip,none, "branch depends on "
      "non-constant value produced by an unevaluated instructions", ())
 NOTE(constexpr_returned_by_unevaluated_instruction,none,
      "return value of an unevaluated instruction is not a constant", ())
 NOTE(constexpr_mutated_by_unevaluated_instruction,none, "value mutable by an "
     "unevaluated instruction is not a constant", ())
-ERROR(not_constant_evaluable, none, "not constant evaluable", ())
 
 ERROR(non_physical_addressof,none,
       "addressof only works with purely physical lvalues; "

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.