---

yaml
---
r: 341231
b: refs/heads/rxwei-patch-1
c: 34aace6
h: refs/heads/master
i:
  341229: eae0b26
  341227: 0ccff8d
  341223: 5428dae
  341215: e143fb3

Author: compnerd

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: 1fa5a6786025b69338ed7b93cb52c6675a0889b5
+refs/heads/rxwei-patch-1: 34aace6b4375e5905f13510ba2044f97f339f079
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/include/swift/AST/ASTPrinter.h

@@ -36,7 +36,6 @@ namespace swift {
   class ValueDecl;
   class SourceLoc;
   enum class tok;
-  enum class AccessorKind;
 
 /// Describes the context in which a name is being printed, which
 /// affects the keywords that need to be escaped.
@@ -340,7 +339,6 @@ void printEnumElementsAsCases(
 void getInheritedForPrinting(const Decl *decl, const PrintOptions &options,
                              llvm::SmallVectorImpl<TypeLoc> &Results);
 
-StringRef getAccessorKindString(AccessorKind value);
 } // namespace swift
 
 #endif // LLVM_SWIFT_AST_ASTPRINTER_H

branches/rxwei-patch-1/include/swift/AST/ASTScope.h

@@ -116,12 +116,6 @@ class AnyFunctionRef {
     return TheFunction.dyn_cast<AbstractClosureExpr*>();
   }
 
-  bool isDeferBody() const {
-    if (auto *fd = dyn_cast_or_null<FuncDecl>(getAbstractFunctionDecl()))
-      return fd->isDeferBody();
-    return false;
-  }
-
   /// Return true if this closure is passed as an argument to a function and is
   /// known not to escape from that function.  In this case, captures can be
   /// more efficient.

branches/rxwei-patch-1/include/swift/AST/AnyFunctionRef.h

@@ -14,7 +14,6 @@
 #define SWIFT_AST_CAPTURE_INFO_H
 
 #include "swift/Basic/LLVM.h"
-#include "swift/Basic/SourceLoc.h"
 #include "swift/AST/TypeAlignments.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/PointerIntPair.h"
@@ -45,9 +44,8 @@ class CapturedValue {
 
 private:
   Storage Value;
-  SourceLoc Loc;
 
-  explicit CapturedValue(Storage V, SourceLoc Loc) : Value(V), Loc(Loc) {}
+  explicit CapturedValue(Storage V) : Value(V) {}
 
 public:
   friend struct llvm::DenseMapInfo<CapturedValue>;
@@ -63,14 +61,12 @@ class CapturedValue {
     IsNoEscape = 1 << 1
   };
 
-  CapturedValue(ValueDecl *Val, unsigned Flags, SourceLoc Loc)
-      : Value(Val, Flags), Loc(Loc) {}
-
-  CapturedValue(OpaqueValueExpr *Val, unsigned Flags)
-      : Value(Val, Flags), Loc(SourceLoc()) {}
+  CapturedValue(llvm::PointerUnion<ValueDecl*, OpaqueValueExpr*> Ptr,
+                unsigned Flags)
+      : Value(Ptr, Flags) {}
 
   static CapturedValue getDynamicSelfMetadata() {
-    return CapturedValue((ValueDecl *)nullptr, 0, SourceLoc());
+    return CapturedValue((ValueDecl *)nullptr, 0);
   }
 
   bool isDirect() const { return Value.getInt() & IsDirect; }
@@ -84,9 +80,7 @@ class CapturedValue {
   CapturedValue mergeFlags(CapturedValue cv) {
     assert(Value.getPointer() == cv.Value.getPointer() &&
            "merging flags on two different value decls");
-    return CapturedValue(
-        Storage(Value.getPointer(), getFlags() & cv.getFlags()),
-        Loc);
+    return CapturedValue(Value.getPointer(), getFlags() & cv.getFlags());
   }
 
   ValueDecl *getDecl() const {
@@ -101,13 +95,49 @@ class CapturedValue {
     return Value.getPointer().dyn_cast<OpaqueValueExpr *>();
   }
 
-  SourceLoc getLoc() const { return Loc; }
-
   unsigned getFlags() const { return Value.getInt(); }
+
+  bool operator==(CapturedValue RHS) const {
+    return Value == RHS.Value;
+  }
+
+  bool operator!=(CapturedValue RHS) const {
+    return Value != RHS.Value;
+  }
+
+  bool operator<(CapturedValue RHS) const {
+    return Value < RHS.Value;
+  }
 };
 
 } // end swift namespace
 
+namespace llvm {
+
+template <> struct DenseMapInfo<swift::CapturedValue> {
+  using CapturedValue = swift::CapturedValue;
+
+  using PtrIntPairDenseMapInfo = DenseMapInfo<CapturedValue::Storage>;
+
+  static inline swift::CapturedValue getEmptyKey() {
+    return CapturedValue{PtrIntPairDenseMapInfo::getEmptyKey()};
+  }
+
+  static inline CapturedValue getTombstoneKey() {
+    return CapturedValue{PtrIntPairDenseMapInfo::getTombstoneKey()};
+  }
+
+  static unsigned getHashValue(const CapturedValue &Val) {
+    return PtrIntPairDenseMapInfo::getHashValue(Val.Value);
+  }
+
+  static bool isEqual(const CapturedValue &LHS, const CapturedValue &RHS) {
+    return PtrIntPairDenseMapInfo::isEqual(LHS.Value, RHS.Value);
+  }
+};
+
+} // end llvm namespace
+
 namespace swift {
 
 class DynamicSelfType;

branches/rxwei-patch-1/include/swift/AST/CaptureInfo.h

@@ -132,8 +132,6 @@ ERROR(sdk_node_unrecognized_decl_attr_kind,none,
       "unrecognized declaration attribute '%0' in SDK node", (StringRef))
 ERROR(sdk_node_unrecognized_decl_kind,none,
       "unrecognized declaration kind '%0' in SDK node", (StringRef))
-ERROR(sdk_node_unrecognized_accessor_kind,none,
-      "unrecognized accessor kind '%0' in SDK node", (StringRef))
 
 //------------------------------------------------------------------------------
 // MARK: Circular reference diagnostics

branches/rxwei-patch-1/include/swift/AST/DiagnosticsCommon.def

@@ -42,6 +42,8 @@ ERROR(raw_type_change,none,"%0(%1) is now %2 representable", (StringRef, StringR
 
 ERROR(removed_decl,none,"%0 has been removed%select{| (deprecated)}1", (StringRef, bool))
 
+ERROR(removed_setter,none,"%0 has removed its setter", (StringRef))
+
 ERROR(moved_decl,none,"%0 has been moved to %1", (StringRef, StringRef))
 
 ERROR(renamed_decl,none,"%0 has been renamed to %1", (StringRef, StringRef))

branches/rxwei-patch-1/include/swift/AST/DiagnosticsModuleDiffer.def

@@ -116,14 +116,6 @@ ERROR(unsupported_c_function_pointer_conversion,none,
 ERROR(objc_selector_malformed,none,"the type ObjectiveC.Selector is malformed",
       ())
 
-// Capture before declaration diagnostics.
-ERROR(capture_before_declaration,none,
-      "closure captures %0 before it is declared", (Identifier))
-ERROR(capture_before_declaration_defer,none,
-      "'defer' block captures %0 before it is declared", (Identifier))
-NOTE(captured_value_declared_here,none,
-     "captured value declared here", ())
-
 // Invalid escaping capture diagnostics.
 ERROR(escaping_inout_capture,none,
       "escaping closure captures 'inout' parameter %0", (Identifier))

branches/rxwei-patch-1/include/swift/AST/DiagnosticsSIL.def

@@ -3016,6 +3016,14 @@ ERROR(method_call_in_closure_without_explicit_self,none,
 ERROR(implicit_use_of_self_in_closure,none,
       "implicit use of 'self' in closure; use 'self.' to make"
       " capture semantics explicit", ())
+ERROR(capture_before_declaration,none,
+      "cannot capture %0 before it is declared", (Identifier))
+ERROR(transitive_capture_before_declaration,none,
+      "cannot capture %0, which would use %1 before it is declared",
+      (Identifier, Identifier))
+NOTE(transitive_capture_through_here,none,
+     "%0, declared here, captures %1",
+     (Identifier, Identifier))
 
 WARNING(recursive_accessor_reference,none,
         "attempting to %select{access|modify}1 %0 within its own "

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

@@ -592,18 +592,17 @@ class AbstractASTScopeDeclConsumer {
   /// Takes an array in order to batch the consumption before setting
   /// IndexOfFirstOuterResult when necessary.
   virtual bool consume(ArrayRef<ValueDecl *> values, DeclVisibilityKind vis,
+                       Optional<bool> isCascadingUse,
                        NullablePtr<DeclContext> baseDC = nullptr) = 0;
 
   /// Eventually this functionality should move into ASTScopeLookup
-  virtual bool
-  lookInMembers(NullablePtr<DeclContext> selfDC, DeclContext *const scopeDC,
-                NominalTypeDecl *const nominal,
-                function_ref<bool(Optional<bool>)> calculateIsCascadingUse) = 0;
+  virtual std::pair<bool, Optional<bool>>
+  lookupInSelfType(NullablePtr<DeclContext> selfDC, DeclContext *const scopeDC,
+                   NominalTypeDecl *const nominal,
+                   Optional<bool> isCascadingUse) = 0;
 
 #ifndef NDEBUG
-  virtual void startingNextLookupStep() = 0;
-  virtual void finishingLookup(std::string) const = 0;
-  virtual bool isTargetLookup() const = 0;
+  virtual void stopForDebuggingIfTargetLookup() = 0;
 #endif
 };
 
@@ -616,19 +615,19 @@ class ASTScopeDeclGatherer : public AbstractASTScopeDeclConsumer {
   virtual ~ASTScopeDeclGatherer() = default;
 
   bool consume(ArrayRef<ValueDecl *> values, DeclVisibilityKind vis,
+               Optional<bool> isCascadingUse,
                NullablePtr<DeclContext> baseDC = nullptr) override;
 
   /// Eventually this functionality should move into ASTScopeLookup
-  bool lookInMembers(NullablePtr<DeclContext>, DeclContext *const,
-                     NominalTypeDecl *const,
-                     function_ref<bool(Optional<bool>)>) override {
-    return false;
+  std::pair<bool, Optional<bool>>
+  lookupInSelfType(NullablePtr<DeclContext>, DeclContext *const,
+                   NominalTypeDecl *const,
+                   Optional<bool> isCascadingUse) override {
+    return std::make_pair(false, isCascadingUse);
   }
 
 #ifndef NDEBUG
-  void startingNextLookupStep() override {}
-  void finishingLookup(std::string) const override {}
-  bool isTargetLookup() const override { return false; }
+  void stopForDebuggingIfTargetLookup() override {}
 #endif
 
   ArrayRef<ValueDecl *> getDecls() { return values; }
@@ -642,17 +641,12 @@ class ASTScope {
 
 public:
   ASTScope(SourceFile *);
-
-  /// \return the scopes traversed
-  static llvm::SmallVector<const ast_scope::ASTScopeImpl *, 0>
+  static Optional<bool>
   unqualifiedLookup(SourceFile *, DeclName, SourceLoc,
                     const DeclContext *startingContext,
+                    Optional<bool> isCascadingUse,
                     namelookup::AbstractASTScopeDeclConsumer &);
 
-  static Optional<bool>
-  computeIsCascadingUse(ArrayRef<const ast_scope::ASTScopeImpl *> history,
-                        Optional<bool> initialIsCascadingUse);
-
   LLVM_ATTRIBUTE_DEPRECATED(void dump() const LLVM_ATTRIBUTE_USED,
                             "only for use within the debugger");
   void print(llvm::raw_ostream &) const;

branches/rxwei-patch-1/include/swift/AST/NameLookup.h

@@ -585,6 +585,10 @@ class alignas(1 << TypeAlignInBits) TypeBase {
   /// existential type throughout the given type.
   Type eraseOpenedExistential(OpenedArchetypeType *opened);
 
+  /// Erase DynamicSelfType from the given type by replacing it with its
+  /// underlying type.
+  Type eraseDynamicSelfType();
+
   /// Given a declaration context, returns a function type with the 'self'
   /// type curried as the input if the declaration context describes a type.
   /// Otherwise, returns the type itself.

branches/rxwei-patch-1/include/swift/AST/Types.h

@@ -247,11 +247,8 @@ namespace swift {
     bool EnableDeserializationRecovery = true;
 
     /// Should we use \c ASTScope-based resolution for unqualified name lookup?
-    /// Default is in \c ParseLangArgs
-    ///
-    /// This is a staging flag; eventually it will be removed.
     bool EnableASTScopeLookup = false;
-
+    
     /// Someday, ASTScopeLookup will supplant lookup in the parser
     bool DisableParserLookup = false;
 

branches/rxwei-patch-1/include/swift/Basic/LangOptions.h

@@ -64,7 +64,8 @@ NODE_KIND_RANGE(Type, TypeNominal, TypeAlias)
 
 NODE_KIND(DeclFunction, Function)
 NODE_KIND(DeclConstructor, Constructor)
-NODE_KIND(DeclAccessor, Accessor)
+NODE_KIND(DeclGetter, Getter)
+NODE_KIND(DeclSetter, Setter)
 NODE_KIND(DeclSubscript, Subscript)
 NODE_KIND_RANGE(DeclAbstractFunc, DeclFunction, DeclSubscript)
 
@@ -125,10 +126,13 @@ KEY_BOOL(IsDeprecated, deprecated)
 KEY_BOOL(IsOverriding, overriding)
 KEY_BOOL(IsProtocolReq, protocolReq)
 KEY_BOOL(HasDefaultArg, hasDefaultArg)
+KEY_BOOL(HasSetter, hasSetter)
 KEY_BOOL(IsLet, isLet)
 KEY_BOOL(IsOpen, isOpen)
 KEY_BOOL(IsInternal, isInternal)
 KEY_BOOL(HasStorage, hasStorage)
+KEY_BOOL(HasDidset, hasDidset)
+KEY_BOOL(HasWillset, hasWillset)
 KEY_BOOL(ReqNewWitnessTableEntry, reqNewWitnessTableEntry)
 KEY_BOOL(IsABIPlaceholder, isABIPlaceholder)
 KEY_BOOL(IsExternal, isExternal)
@@ -162,8 +166,6 @@ KEY(typeAttributes)
 KEY(declAttributes)
 KEY(declKind)
 KEY(ownership)
-KEY(accessors)
-KEY(accessorKind)
 
 KNOWN_TYPE(Optional)
 KNOWN_TYPE(ImplicitlyUnwrappedOptional)

branches/rxwei-patch-1/include/swift/IDE/DigesterEnums.def

@@ -869,12 +869,7 @@ def enable_astscope_lookup : Flag<["-"], "enable-astscope-lookup">,
   Flags<[FrontendOption]>,
   HelpText<"Enable ASTScope-based unqualified name lookup">;
 
-def disable_astscope_lookup : Flag<["-"], "disable-astscope-lookup">,
-  Flags<[FrontendOption]>,
-  HelpText<"Disable ASTScope-based unqualified name lookup">;
-
-def disable_parser_lookup : Flag<["-"], "disable-parser-lookup">,
-  Flags<[FrontendOption]>,
+def disable_parser_lookup : Flag<["-"], "disable_parser_lookup">,
   HelpText<"Disable parser lookup & use ast scope lookup only (experimental)">;
 
 def index_file : Flag<["-"], "index-file">,

branches/rxwei-patch-1/include/swift/Option/Options.td

@@ -568,6 +568,8 @@ struct SILConstantInfo {
 
 /// Different ways in which a function can capture context.
 enum class CaptureKind {
+  /// No context arguments are necessary.
+  None,
   /// A local value captured as a mutable box.
   Box,
   /// A local value captured as a single pointer to storage (formed with

branches/rxwei-patch-1/include/swift/SIL/TypeLowering.h

@@ -310,6 +310,16 @@ static StringRef getDefaultArgumentKindString(DefaultArgumentKind value) {
 
   llvm_unreachable("Unhandled DefaultArgumentKind in switch.");
 }
+static StringRef getAccessorKindString(AccessorKind value) {
+  switch (value) {
+#define ACCESSOR(ID)
+#define SINGLETON_ACCESSOR(ID, KEYWORD) \
+  case AccessorKind::ID: return #KEYWORD;
+#include "swift/AST/AccessorKinds.def"
+  }
+
+  llvm_unreachable("Unhandled AccessorKind in switch.");
+}
 static StringRef
 getMagicIdentifierLiteralExprKindString(MagicIdentifierLiteralExpr::Kind value) {
   switch (value) {
@@ -3749,14 +3759,3 @@ void GenericEnvironment::dump(raw_ostream &os) const {
 void GenericEnvironment::dump() const {
   dump(llvm::errs());
 }
-
-StringRef swift::getAccessorKindString(AccessorKind value) {
-  switch (value) {
-#define ACCESSOR(ID)
-#define SINGLETON_ACCESSOR(ID, KEYWORD) \
-  case AccessorKind::ID: return #KEYWORD;
-#include "swift/AST/AccessorKinds.def"
-  }
-
-  llvm_unreachable("Unhandled AccessorKind in switch.");
-}