---

yaml
---
r: 314239
b: refs/heads/rxwei-patch-6
c: 3691944
h: refs/heads/master
i:
  314237: f1dd8cc
  314235: 3179342
  314231: 7a490d2
  314223: 48e2025
  314207: 289870e
  314175: 1a66358
  314111: e45cced

Author: atrick

[refs]

@@ -1422,7 +1422,7 @@ refs/heads/remove-AlignedCharArray: a09ee8660ce66898d5a5a04e2adb4a5ecf1c4644
 refs/heads/revert-25193-gsoc-2019-parser: c66a8be4eb8cea9e606bcbfce52820ad02f23413
 refs/heads/revert-25911-revert-25766-reenable-test-tsan-norace-deinit: 0f330b25b83d3c83ce993f535d4a83bb626aafa3
 refs/heads/revert-26183-rename-adjoint-to-pullback: b16bd9f4bc54ae8ec31f412ac542dcf6f522d9ee
-refs/heads/rxwei-patch-6: 9627a05e005277752492f57cd0fed33de2a739b8
+refs/heads/rxwei-patch-6: 369194427ef1750a7dd1a7880a6030244f7ae38e
 refs/heads/shahmishal-patch-3: f3e0bc73927d564bb35354dc6473a1981f2a864e
 refs/heads/shahmishal/pr-swiftsyntax-test: 64ff140a6dfa78ecea27eeb6d29582650198f3e0
 refs/heads/test-libdispatch-preset-on-swift-5.1-branch: 2ab0acdec00ee31d21490154081c3001648a8b85

branches/rxwei-patch-6/README.md

@@ -76,7 +76,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
 
 #### macOS
 
-To build for macOS, you need [Xcode 11 beta 4](https://developer.apple.com/xcode/downloads/).
+To build for macOS, you need [Xcode 11 beta 5](https://developer.apple.com/xcode/downloads/).
 The required version of Xcode changes frequently, and is often a beta release.
 Check this document or the host information on <https://ci.swift.org> for the
 current required version.

branches/rxwei-patch-6/include/swift/ABI/TrailingObjects.h

@@ -97,27 +97,20 @@ class TrailingObjectsBase {
   template <typename T> struct OverloadToken {};
 };
 
-/// This helper template works-around MSVC 2013's lack of useful
-/// alignas() support. The argument to LLVM_ALIGNAS(), in MSVC, is
-/// required to be a literal integer. But, you *can* use template
-/// specialization to select between a bunch of different LLVM_ALIGNAS
-/// expressions...
 template <int Align>
 class TrailingObjectsAligner : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(1) TrailingObjectsAligner<1> : public TrailingObjectsBase {};
+class alignas(1) TrailingObjectsAligner<1> : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(2) TrailingObjectsAligner<2> : public TrailingObjectsBase {};
+class alignas(2) TrailingObjectsAligner<2> : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(4) TrailingObjectsAligner<4> : public TrailingObjectsBase {};
+class alignas(4) TrailingObjectsAligner<4> : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(8) TrailingObjectsAligner<8> : public TrailingObjectsBase {};
+class alignas(8) TrailingObjectsAligner<8> : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(16) TrailingObjectsAligner<16> : public TrailingObjectsBase {
-};
+class alignas(16) TrailingObjectsAligner<16> : public TrailingObjectsBase {};
 template <>
-class LLVM_ALIGNAS(32) TrailingObjectsAligner<32> : public TrailingObjectsBase {
-};
+class alignas(32) TrailingObjectsAligner<32> : public TrailingObjectsBase {};
 
 // Just a little helper for transforming a type pack into the same
 // number of a different type. e.g.:

branches/rxwei-patch-6/include/swift/AST/ASTContext.h

@@ -899,8 +899,20 @@ class ASTContext final {
   CanGenericSignature getExistentialSignature(CanType existential,
                                               ModuleDecl *mod);
 
-  GenericSignature *getOverrideGenericSignature(ValueDecl *base,
-                                                ValueDecl *derived);
+  GenericSignature *getOverrideGenericSignature(const ValueDecl *base,
+                                                const ValueDecl *derived);
+
+  enum class OverrideGenericSignatureReqCheck {
+    /// Base method's generic requirements are satisifed by derived method
+    BaseReqSatisfiedByDerived,
+
+    /// Derived method's generic requirements are satisifed by base method
+    DerivedReqSatisfiedByBase
+  };
+
+  bool overrideGenericSignatureReqsSatisfied(
+      const ValueDecl *base, const ValueDecl *derived,
+      const OverrideGenericSignatureReqCheck direction);
 
   /// Whether our effective Swift version is at least 'major'.
   ///

branches/rxwei-patch-6/include/swift/AST/ASTTypeIDZone.def

@@ -20,6 +20,7 @@ SWIFT_TYPEID_NAMED(ValueDecl *, ValueDecl)
 SWIFT_TYPEID_NAMED(ProtocolDecl *, ProtocolDecl)
 SWIFT_TYPEID_NAMED(Decl *, Decl)
 SWIFT_TYPEID(Type)
+SWIFT_TYPEID(TypePair)
 SWIFT_TYPEID(PropertyWrapperBackingPropertyInfo)
 SWIFT_TYPEID(PropertyWrapperTypeInfo)
 SWIFT_TYPEID(CtorInitializerKind)

branches/rxwei-patch-6/include/swift/AST/ASTTypeIDs.h

@@ -30,6 +30,7 @@ class Type;
 class VarDecl;
 class TypeAliasDecl;
 class Type;
+struct TypePair;
 
 #define SWIFT_AST_TYPEID_ZONE 1
 

branches/rxwei-patch-6/include/swift/AST/ASTWalker.h

@@ -221,6 +221,15 @@ class ASTWalker {
   /// bodies of closures that have not yet been type checked.
   virtual bool shouldWalkIntoNonSingleExpressionClosure() { return true; }
 
+  /// This method configures whether the walker should exhibit the legacy
+  /// behavior where accessors appear as peers of their storage, rather
+  /// than children nested inside of it.
+  ///
+  /// Please don't write new ASTWalker implementations that override this
+  /// method to return true; instead, refactor existing code as needed
+  /// until eventually we can remove this altogether.
+  virtual bool shouldWalkAccessorsTheOldWay() { return false; }
+
   /// walkToParameterListPre - This method is called when first visiting a
   /// ParameterList, before walking into its parameters.  If it returns false,
   /// the subtree is skipped.

branches/rxwei-patch-6/include/swift/AST/Decl.h

@@ -445,9 +445,15 @@ class alignas(1 << DeclAlignInBits) Decl {
     SelfAccess : 2
   );
 
-  SWIFT_INLINE_BITFIELD(AccessorDecl, FuncDecl, 4,
+  SWIFT_INLINE_BITFIELD(AccessorDecl, FuncDecl, 4+1+1,
     /// The kind of accessor this is.
-    AccessorKind : 4
+    AccessorKind : 4,
+
+    /// Whether the accessor is transparent.
+    IsTransparent : 1,
+
+    /// Whether we have computed the above.
+    IsTransparentComputed : 1
   );
 
   SWIFT_INLINE_BITFIELD(ConstructorDecl, AbstractFunctionDecl, 3+2+1,
@@ -2582,12 +2588,6 @@ class ValueDecl : public Decl {
   void setInterfaceType(Type type);
 
   bool hasValidSignature() const;
-
-  /// isSettable - Determine whether references to this decl may appear
-  /// on the left-hand side of an assignment or as the operand of a
-  /// `&` or 'inout' operator.
-  bool isSettable(const DeclContext *UseDC,
-                  const DeclRefExpr *base = nullptr) const;
 
   /// isInstanceMember - Determine whether this value is an instance member
   /// of an enum or protocol.
@@ -4389,6 +4389,9 @@ class AbstractStorageDecl : public ValueDecl {
   friend class IsSetterMutatingRequest;
   friend class OpaqueReadOwnershipRequest;
   friend class StorageImplInfoRequest;
+  friend class RequiresOpaqueAccessorsRequest;
+  friend class RequiresOpaqueModifyCoroutineRequest;
+  friend class SynthesizeAccessorRequest;
 
 public:
   static const size_t MaxNumAccessors = 255;
@@ -4452,11 +4455,18 @@ class AbstractStorageDecl : public ValueDecl {
     unsigned OpaqueReadOwnershipComputed : 1;
     unsigned OpaqueReadOwnership : 2;
     unsigned ImplInfoComputed : 1;
+    unsigned RequiresOpaqueAccessorsComputed : 1;
+    unsigned RequiresOpaqueAccessors : 1;
+    unsigned RequiresOpaqueModifyCoroutineComputed : 1;
+    unsigned RequiresOpaqueModifyCoroutine : 1;
   } LazySemanticInfo = { };
 
   /// The implementation info for the accessors.
   StorageImplInfo ImplInfo;
 
+  /// Add a synthesized accessor.
+  void setSynthesizedAccessor(AccessorKind kind, AccessorDecl *getter);
+
 protected:
   AbstractStorageDecl(DeclKind Kind, bool IsStatic, DeclContext *DC,
                       DeclName Name, SourceLoc NameLoc,
@@ -4530,6 +4540,12 @@ class AbstractStorageDecl : public ValueDecl {
     return getImplInfo().supportsMutation();
   }
 
+  /// isSettable - Determine whether references to this decl may appear
+  /// on the left-hand side of an assignment or as the operand of a
+  /// `&` or 'inout' operator.
+  bool isSettable(const DeclContext *UseDC,
+                  const DeclRefExpr *base = nullptr) const;
+
   /// Are there any accessors for this declaration, including implicit ones?
   bool hasAnyAccessors() const {
     return !getAllAccessors().empty();
@@ -4570,6 +4586,12 @@ class AbstractStorageDecl : public ValueDecl {
     return {};
   }
 
+  /// Return an accessor that this storage is expected to have, synthesizing
+  /// one if necessary. Note that will always synthesize one, even if the
+  /// accessor is not part of the expected opaque set for the storage, so use
+  /// with caution.
+  AccessorDecl *getSynthesizedAccessor(AccessorKind kind) const;
+
   /// Visit all the opaque accessors that this storage is expected to have.
   void visitExpectedOpaqueAccessors(
                             llvm::function_ref<void (AccessorKind)>) const;
@@ -4585,17 +4607,8 @@ class AbstractStorageDecl : public ValueDecl {
   /// This should only be used by the ClangImporter.
   void setComputedSetter(AccessorDecl *Set);
 
-  /// Add a synthesized getter.
-  void setSynthesizedGetter(AccessorDecl *getter);
-
-  /// Add a synthesized setter.
-  void setSynthesizedSetter(AccessorDecl *setter);
-
-  /// Add a synthesized read coroutine.
-  void setSynthesizedReadCoroutine(AccessorDecl *read);
-
-  /// Add a synthesized modify coroutine.
-  void setSynthesizedModifyCoroutine(AccessorDecl *modify);
+  /// Does this storage require opaque accessors of any kind?
+  bool requiresOpaqueAccessors() const;
 
   /// Does this storage require an opaque accessor of the given kind?
   bool requiresOpaqueAccessor(AccessorKind kind) const;
@@ -4634,6 +4647,10 @@ class AbstractStorageDecl : public ValueDecl {
 
   AccessLevel getSetterFormalAccess() const;
 
+  AccessScope
+  getSetterFormalAccessScope(const DeclContext *useDC = nullptr,
+                             bool treatUsableFromInlineAsPublic = false) const;
+
   void setSetterAccess(AccessLevel accessLevel) {
     assert(!Accessors.getInt().hasValue());
     overwriteSetterAccess(accessLevel);
@@ -5472,9 +5489,6 @@ class SubscriptDecl : public GenericContext, public AbstractStorageDecl {
   /// element types.
   void computeType();
 
-  /// Returns whether the result of the subscript operation can be set.
-  bool isSettable() const;
-
   /// Determine the kind of Objective-C subscripting this declaration
   /// implies.
   ObjCSubscriptKind getObjCSubscriptKind() const;
@@ -5853,10 +5867,6 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     return cast_or_null<AbstractFunctionDecl>(ValueDecl::getOverriddenDecl());
   }
 
-  /// Returns true if a function declaration overrides a given
-  /// method from its direct or indirect superclass.
-  bool isOverridingDecl(const AbstractFunctionDecl *method) const;
-
   /// Whether the declaration is later overridden in the module
   ///
   /// Overrides are resolved during type checking; only query this field after
@@ -6155,6 +6165,14 @@ class AccessorDecl final : public FuncDecl {
                                   DeclContext *parent,
                                   ClangNode clangNode);
 
+  Optional<bool> getCachedIsTransparent() const {
+    if (Bits.AccessorDecl.IsTransparentComputed)
+      return Bits.AccessorDecl.IsTransparent;
+    return None;
+  }
+
+  friend class IsAccessorTransparentRequest;
+
 public:
   static AccessorDecl *createDeserialized(ASTContext &ctx,
                               SourceLoc declLoc,
@@ -6233,6 +6251,11 @@ class AccessorDecl final : public FuncDecl {
     llvm_unreachable("bad accessor kind");
   }
 
+  void setIsTransparent(bool transparent) {
+    Bits.AccessorDecl.IsTransparent = transparent;
+    Bits.AccessorDecl.IsTransparentComputed = 1;
+  }
+
   static bool classof(const Decl *D) {
     return D->getKind() == DeclKind::Accessor;
   }
@@ -7041,22 +7064,14 @@ class MissingMemberDecl : public Decl {
   }
 public:
   static MissingMemberDecl *
-  forMethod(ASTContext &ctx, DeclContext *DC, DeclName name,
-            bool hasNormalVTableEntry) {
-    assert(!name || name.isCompoundName());
-    return new (ctx) MissingMemberDecl(DC, name, hasNormalVTableEntry, 0);
-  }
+  create(ASTContext &ctx, DeclContext *DC, DeclName name,
+         unsigned numVTableEntries, bool hasStorage) {
+    assert(!numVTableEntries || isa<ProtocolDecl>(DC) || isa<ClassDecl>(DC) &&
+           "Only classes and protocols have vtable/witness table entries");
+    assert(!hasStorage || !isa<ProtocolDecl>(DC) &&
+           "Protocols cannot have missing stored properties");
 
-  static MissingMemberDecl *
-  forInitializer(ASTContext &ctx, DeclContext *DC, DeclName name,
-                 bool hasVTableEntry) {
-    unsigned entries = hasVTableEntry ? 1 : 0;
-    return new (ctx) MissingMemberDecl(DC, name, entries, 0);
-  }
-  
-  static MissingMemberDecl *
-  forStoredProperty(ASTContext &ctx, DeclContext *DC, DeclName name) {
-    return new (ctx) MissingMemberDecl(DC, name, 0, 1);
+    return new (ctx) MissingMemberDecl(DC, name, numVTableEntries, hasStorage);
   }
 
   DeclName getFullName() const {
@@ -7084,14 +7099,13 @@ class MissingMemberDecl : public Decl {
   }
 };
 
-inline bool ValueDecl::isSettable(const DeclContext *UseDC,
-                                  const DeclRefExpr *base) const {
-  if (auto vd = dyn_cast<VarDecl>(this)) {
+inline bool AbstractStorageDecl::isSettable(const DeclContext *UseDC,
+                                            const DeclRefExpr *base) const {
+  if (auto vd = dyn_cast<VarDecl>(this))
     return vd->isSettable(UseDC, base);
-  } else if (auto sd = dyn_cast<SubscriptDecl>(this)) {
-    return sd->isSettable();
-  } else
-    return false;
+
+  auto sd = cast<SubscriptDecl>(this);
+  return sd->supportsMutation();
 }
 
 inline void

branches/rxwei-patch-6/include/swift/AST/DiagnosticsSema.def

@@ -4480,7 +4480,7 @@ NOTE(property_wrapper_declared_here,none,
 
 ERROR(property_wrapper_mutating_get_composed_to_get_only,none,
       "property wrapper %0 with a mutating getter cannot be composed inside "
-      "get-only property wrapper %1", (Type, Type))
+      "get-only property wrapper %1", (TypeLoc, TypeLoc))
 
 ERROR(property_wrapper_local,none,
       "property wrappers are not yet supported on local properties", ())

branches/rxwei-patch-6/include/swift/AST/StorageImpl.h

@@ -383,6 +383,9 @@ class StorageImplInfo {
   }
 };
 
+StringRef getAccessorLabel(AccessorKind kind);
+void simple_display(llvm::raw_ostream &out, AccessorKind kind);
+
 } // end namespace swift
 
 #endif