Merge branch 'master' into mracek/arm64e

Author: kubamracek

docs/ABI/Mangling.rst

@@ -585,7 +585,7 @@ mangled in to disambiguate.
   impl-function-type ::= type* 'I' FUNC-ATTRIBUTES '_'
   impl-function-type ::= type* generic-signature 'I' PSEUDO-GENERIC? FUNC-ATTRIBUTES '_'
 
-  FUNC-ATTRIBUTES ::= CALLEE-ESCAPE? CALLEE-CONVENTION FUNC-REPRESENTATION? PARAM-CONVENTION* RESULT-CONVENTION* ('z' RESULT-CONVENTION)
+  FUNC-ATTRIBUTES ::= CALLEE-ESCAPE? CALLEE-CONVENTION FUNC-REPRESENTATION? COROUTINE-KIND? PARAM-CONVENTION* RESULT-CONVENTION* ('Y' PARAM-CONVENTION)* ('z' RESULT-CONVENTION)?
 
   PSEUDO-GENERIC ::= 'P'
 
@@ -603,6 +603,9 @@ mangled in to disambiguate.
   FUNC-REPRESENTATION ::= 'K'                // closure
   FUNC-REPRESENTATION ::= 'W'                // protocol witness
 
+  COROUTINE-KIND ::= 'A'                     // yield-once coroutine
+  COROUTINE-KIND ::= 'G'                     // yield-many coroutine
+
   PARAM-CONVENTION ::= 'i'                   // indirect in
   PARAM-CONVENTION ::= 'c'                   // indirect in constant
   PARAM-CONVENTION ::= 'l'                   // indirect inout

docs/OptimizationTips.rst

@@ -165,7 +165,7 @@ assuming ``E``, ``F`` do not have any overriding declarations in the same file:
   }
 
 Advice: If WMO is enabled, use 'internal' when a declaration does not need to be accessed outside of module
----------------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------
 
 WMO (see section above) causes the compiler to compile a module's
 sources all together at once. This allows the optimizer to have module

include/swift/AST/Attr.def

@@ -520,7 +520,7 @@ SIMPLE_DECL_ATTR(_inheritsConvenienceInitializers,
   93)
 
 DECL_ATTR(_typeEraser, TypeEraser,
-  OnProtocol | UserInaccessible | NotSerialized |
+  OnProtocol | UserInaccessible |
   ABIStableToAdd | ABIBreakingToRemove | APIStableToAdd | APIBreakingToRemove,
   94)
 

include/swift/AST/Decl.h

@@ -665,9 +665,10 @@ class alignas(1 << DeclAlignInBits) Decl {
     SourceLoc Loc;
     SourceLoc StartLoc;
     SourceLoc EndLoc;
+    SmallVector<CharSourceRange, 4> DocRanges;
   };
-  mutable CachedExternalSourceLocs const *CachedLocs = nullptr;
-  const CachedExternalSourceLocs *calculateSerializedLocs() const;
+  mutable CachedExternalSourceLocs const *CachedSerializedLocs = nullptr;
+  const CachedExternalSourceLocs *getSerializedLocs() const;
 protected:
 
   Decl(DeclKind kind, llvm::PointerUnion<DeclContext *, ASTContext *> context)
@@ -828,7 +829,7 @@ class alignas(1 << DeclAlignInBits) Decl {
   }
 
   /// \returns the unparsed comment attached to this declaration.
-  RawComment getRawComment() const;
+  RawComment getRawComment(bool SerializedOK = false) const;
 
   Optional<StringRef> getGroupName() const;
 
@@ -882,6 +883,9 @@ class alignas(1 << DeclAlignInBits) Decl {
   bool hasUnderscoredNaming() const;
 
   bool isPrivateStdlibDecl(bool treatNonBuiltinProtocolsAsPublic = true) const;
+  
+  /// Check if this is a declaration defined at the top level of the Swift module
+  bool isStdlibDecl() const;
 
   AvailabilityContext getAvailabilityForLinkage() const;
 
@@ -916,6 +920,9 @@ class alignas(1 << DeclAlignInBits) Decl {
   /// If this returns true, the decl can be safely casted to ValueDecl.
   bool isPotentiallyOverridable() const;
 
+  /// Returns true if this Decl cannot be seen by any other source file
+  bool isPrivateToEnclosingFile() const;
+
   /// If an alternative module name is specified for this decl, e.g. using
   /// @_originalDefinedIn attribute, this function returns this module name.
   StringRef getAlternateModuleName() const;

include/swift/AST/DeclContext.h

@@ -814,7 +814,7 @@ class IterableDeclContext {
   /// available.
   Optional<std::string> getBodyFingerprint() const;
 
-  bool areDependenciesUsingTokenHashesForTypeBodies() const;
+  bool areTokensHashedForThisBodyInsteadOfInterfaceHash() const;
 
 private:
   /// Add a member to the list for iteration purposes, but do not notify the

include/swift/AST/DiagnosticsSema.def

@@ -577,6 +577,9 @@ ERROR(expr_swift_keypath_invalid_component,none,
       "invalid component of Swift key path", ())
 ERROR(expr_swift_keypath_not_starting_with_type,none,
       "a Swift key path must begin with a type", ())
+ERROR(expr_swift_keypath_not_starting_with_dot,none,
+      "a Swift key path with contextual root must begin with a leading dot",
+      ())
 ERROR(expr_smart_keypath_value_covert_to_contextual_type,none,
       "key path value type %0 cannot be converted to contextual type %1",
       (Type, Type))
@@ -3285,14 +3288,16 @@ ERROR(partial_application_of_function_invalid,none,
       "partial application of %select{"
         "'mutating' method|"
         "'super.init' initializer chain|"
-        "'self.init' initializer delegation"
+        "'self.init' initializer delegation|"
+        "'super' instance method with metatype base"
       "}0 is not allowed",
       (unsigned))
 WARNING(partial_application_of_function_invalid_swift4,none,
       "partial application of %select{"
         "'mutating' method|"
         "'super.init' initializer chain|"
-        "'self.init' initializer delegation"
+        "'self.init' initializer delegation|"
+        "'super' instance method with metatype base"
       "}0 is not allowed; calling the function has undefined behavior and will "
       "be an error in future Swift versions",
       (unsigned))
@@ -4795,7 +4800,7 @@ ERROR(property_wrapper_wrong_initial_value_init, none,
       "'wrappedValue' property type (%2) or an @autoclosure thereof",
       (DeclName, Type, Type))
 ERROR(property_wrapper_failable_init, none,
-      "%0 cannot be failable", (DeclName))
+      "property wrapper initializer %0 cannot be failable", (DeclName))
 ERROR(property_wrapper_type_requirement_not_accessible,none,
       "%select{private|fileprivate|internal|public|open}0 %1 %2 cannot have "
       "more restrictive access than its enclosing property wrapper type %3 "

include/swift/AST/EducationalNotes.def

@@ -34,4 +34,13 @@ EDUCATIONAL_NOTES(invalid_dynamic_callable_type,
 EDUCATIONAL_NOTES(missing_dynamic_callable_kwargs_method,
                   "dynamic-callable-requirements.md")
 
+EDUCATIONAL_NOTES(property_wrapper_no_value_property,
+                  "property-wrapper-requirements.md")
+EDUCATIONAL_NOTES(property_wrapper_wrong_initial_value_init,
+                  "property-wrapper-requirements.md")
+EDUCATIONAL_NOTES(property_wrapper_failable_init,
+                  "property-wrapper-requirements.md")
+EDUCATIONAL_NOTES(property_wrapper_type_requirement_not_accessible,
+                  "property-wrapper-requirements.md")
+
 #undef EDUCATIONAL_NOTES

include/swift/AST/FineGrainedDependencies.h

@@ -17,6 +17,7 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/NullablePtr.h"
 #include "swift/Basic/Range.h"
+#include "swift/Basic/ReferenceDependencyKeys.h"
 #include "llvm/ADT/Hashing.h"
 #include "llvm/Support/MD5.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -350,33 +351,6 @@ bool emitReferenceDependencies(DiagnosticEngine &diags, SourceFile *SF,
 // MARK: Enums
 //==============================================================================
 
-/// Encode the current sorts of dependencies as kinds of nodes in the dependency
-/// graph, splitting the current *member* into \ref member and \ref
-/// potentialMember and adding \ref sourceFileProvide.
-
-enum class NodeKind {
-  topLevel,
-  nominal,
-  /// In the status quo scheme, *member* dependencies could have blank names
-  /// for the member, to indicate that the provider might add members.
-  /// This code uses a separate kind, \ref potentialMember. The holder field is
-  /// unused.
-  potentialMember,
-  /// Corresponding to the status quo *member* dependency with a non-blank
-  /// member.
-  member,
-  dynamicLookup,
-  externalDepend,
-  sourceFileProvide,
-  /// For iterating through the NodeKinds.
-  kindCount
-};
-
-/// Used for printing out NodeKinds to dot files, and dumping nodes for
-/// debugging.
-const std::string NodeKindNames[]{
-    "topLevel",      "nominal",        "potentialMember",  "member",
-    "dynamicLookup", "externalDepend", "sourceFileProvide"};
 
 /// Instead of the status quo scheme of two kinds of "Depends", cascading and
 /// non-cascading this code represents each entity ("Provides" in the status

include/swift/AST/RawComment.h

@@ -86,6 +86,7 @@ struct LineColumn {
 
 struct BasicDeclLocs {
   StringRef SourceFilePath;
+  SmallVector<std::pair<LineColumn, uint32_t>, 4> DocRanges;
   LineColumn Loc;
   LineColumn StartLoc;
   LineColumn EndLoc;

include/swift/AST/ReferencedNameTracker.h

@@ -14,23 +14,33 @@
 #define SWIFT_REFERENCEDNAMETRACKER_H
 
 #include "swift/AST/Identifier.h"
+#include "swift/Basic/ReferenceDependencyKeys.h"
 #include "llvm/ADT/DenseMap.h"
 
+#include <unordered_set>
+
 namespace swift {
 
 class NominalTypeDecl;
+class DependencyTracker;
 
 class ReferencedNameTracker {
-#define TRACKED_SET(KIND, NAME) \
-private: \
-  llvm::DenseMap<KIND, bool> NAME##s; \
-public: \
-  void add##NAME(KIND new##NAME, bool isCascadingUse) { \
-    NAME##s[new##NAME] |= isCascadingUse; \
-  } \
-  const decltype(NAME##s) &get##NAME##s() const { \
-    return NAME##s; \
-  }
+public:
+  using EnumerateUsedDecl = function_ref<void(
+      fine_grained_dependencies::NodeKind kind, StringRef context,
+      StringRef name, bool isCascadingUse)>;
+
+private:
+#define TRACKED_SET(KIND, NAME)                                                \
+private:                                                                       \
+  llvm::DenseMap<KIND, bool> NAME##s;                                          \
+                                                                               \
+public:                                                                        \
+  void add##NAME(KIND new##NAME, bool isCascadingUse) {                        \
+    NAME##s[new##NAME] |= isCascadingUse;                                      \
+  }                                                                            \
+  /* make private once ReferenceDependencies.cpp is gone */                    \
+  const decltype(NAME##s) &get##NAME##s() const { return NAME##s; }
 
   TRACKED_SET(DeclBaseName, TopLevelName)
   TRACKED_SET(DeclBaseName, DynamicLookupName)
@@ -39,6 +49,33 @@ public: \
   TRACKED_SET(MemberPair, UsedMember)
 
 #undef TRACKED_SET
+public:
+  // Pushing the DependencyTracker through unifies external dependency
+  // enumeration.
+  void enumerateAllUses(bool includeIntrafileDeps,
+                        const DependencyTracker &depTracker,
+                        EnumerateUsedDecl enumerateUsedDecl) const;
+
+private:
+  template <fine_grained_dependencies::NodeKind kind>
+  void enumerateSimpleUses(llvm::DenseMap<DeclBaseName, bool> cascadesByName,
+                           EnumerateUsedDecl enumerateUsedDecl) const;
+
+  void enumerateExternalUses(const DependencyTracker &,
+                             EnumerateUsedDecl enumerateUsedDecl) const;
+
+  void enumerateCompoundUses(bool includeIntrafileDeps,
+                             EnumerateUsedDecl enumerateUsedDecl) const;
+
+  std::unordered_set<std::string>
+  computeHoldersOfCascadingMembers(bool includeIntrafileDeps) const;
+
+  void enumerateNominalUses(
+      bool includeIntrafileDeps,
+      const std::unordered_set<std::string> &&holdersOfCascadingMembers,
+      EnumerateUsedDecl enumerateUsedDecl) const;
+
+  void enumerateMemberUses(EnumerateUsedDecl enumerateUsedDecl) const;
 };
 
 } // end namespace swift