Merge pull request #3459 from swiftwasm/maxd/main-merge

Resolve conflicts with upstream `main`

Author: MaxDesiatov

CMakeLists.txt

@@ -127,6 +127,10 @@ option(SWIFT_BUILD_PERF_TESTSUITE
 
 option(SWIFT_INCLUDE_TESTS "Create targets for building/running tests." TRUE)
 
+option(SWIFT_INCLUDE_TEST_BINARIES
+  "Create targets for building/running test binaries even if SWIFT_INCLUDE_TESTS is disabled"
+  TRUE)
+
 option(SWIFT_INCLUDE_DOCS
     "Create targets for building docs."
     TRUE)

include/swift/AST/ASTPrinter.h

@@ -86,6 +86,20 @@ enum class PrintStructureKind {
   TupleElement,
   NumberLiteral,
   StringLiteral,
+  /// ' = defaultValue'.
+  DefaultArgumentClause,
+  /// '<T, U: Requirement>'.
+  DeclGenericParameterClause,
+  /// 'where T: Collection, T.Element: Equtable'.
+  DeclGenericRequirementClause,
+  /// ' async throws'.
+  EffectsSpecifiers,
+  /// ' -> ResultTy' or ': ResultTy'.
+  DeclResultTypeClause,
+  /// '(a: Int, b param: String)' in function declarations.
+  FunctionParameterList,
+  /// '@attribute ParamTy...' in parameter declarations.
+  FunctionParameterType,
 };
 
 /// An abstract class used to print an AST.

include/swift/AST/RawComment.h

@@ -55,6 +55,10 @@ struct SingleRawComment {
     return getKind() == CommentKind::OrdinaryLine ||
            getKind() == CommentKind::LineDoc;
   }
+
+  bool isGyb() const {
+    return RawText.startswith("// ###");
+  }
 };
 
 struct RawComment {

include/swift/Basic/Platform.h

@@ -55,9 +55,10 @@ namespace swift {
   bool triplesAreValidForZippering(const llvm::Triple &target,
                                    const llvm::Triple &targetVariant);
 
-  /// Returns true if the given triple represents an OS that ships with
-  /// ABI-stable swift libraries (eg. in /usr/lib/swift).
-  bool tripleRequiresRPathForSwiftInOS(const llvm::Triple &triple);
+  /// Returns true if the given triple represents an OS that has all the
+  /// "built-in" ABI-stable libraries (stdlib and _Concurrency)
+  /// (eg. in /usr/lib/swift).
+  bool tripleRequiresRPathForSwiftLibrariesInOS(const llvm::Triple &triple);
 
   /// Returns the platform name for a given target triple.
   ///

include/swift/Frontend/ModuleInterfaceLoader.h

@@ -139,7 +139,8 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
                   std::unique_ptr<llvm::MemoryBuffer> *moduleBuffer,
                   std::unique_ptr<llvm::MemoryBuffer> *moduleDocBuffer,
                   std::unique_ptr<llvm::MemoryBuffer> *moduleSourceInfoBuffer,
-                  bool &isFramework, bool &isSystemModule) override;
+                  bool skipBuildingInterface, bool &isFramework,
+                  bool &isSystemModule) override;
 
   std::error_code findModuleFilesInDirectory(
                   ImportPath::Element ModuleID,
@@ -148,7 +149,7 @@ class ExplicitSwiftModuleLoader: public SerializedModuleLoaderBase {
                   std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
                   std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
                   std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer,
-                  bool IsFramework) override;
+                  bool skipBuildingInterface, bool IsFramework) override;
 
   bool canImportModule(ImportPath::Element mID, llvm::VersionTuple version,
                        bool underlyingVersion) override;
@@ -400,7 +401,7 @@ class ModuleInterfaceLoader : public SerializedModuleLoaderBase {
      std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
      std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
      std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer,
-     bool IsFramework) override;
+     bool skipBuildingInterface, bool IsFramework) override;
 
   bool isCached(StringRef DepPath) override;
 public:

include/swift/IDE/CodeCompletion.h

@@ -132,6 +132,14 @@ class CodeCompletionStringChunk {
     Equal,
     Whitespace,
 
+    /// The first chunk of a whole generic parameter clause.
+    /// E.g '<T, C: Collection>'
+    GenericParameterClauseBegin,
+
+    /// The first chunk of a generic quirement clause.
+    /// E.g. 'where T: Collection, T.Element == Int'
+    GenericRequirementClauseBegin,
+
     /// The first chunk of a substring that describes the parameter for a
     /// generic type.
     GenericParameterBegin,
@@ -194,6 +202,30 @@ class CodeCompletionStringChunk {
     /// desired.
     OptionalMethodCallTail,
 
+    /// The first chunk of a substring that describes the single parameter
+    /// declaration for a parameter clause.
+    ParameterDeclBegin,
+
+    ParameterDeclExternalName,
+
+    ParameterDeclLocalName,
+
+    ParameterDeclColon,
+
+    ParameterDeclTypeBegin,
+
+    /// Default argument clause for parameter declarations.
+    DefaultArgumentClauseBegin,
+
+    /// First chunk for effect specifiers. i.e. 'async' and 'throws'.
+    EffectsSpecifierClauseBegin,
+
+    /// First chunk for result type clause i.e. ' -> ResultTy' or ': ResultTy'.
+    DeclResultTypeClauseBegin,
+
+    /// First chunk for attribute and modifier list i.e. 'override public'
+    AttributeAndModifierListBegin,
+
     /// Specifies the type of the whole entity that is returned in this code
     /// completion result.  For example, for variable references it is the
     /// variable type, for function calls it is the return type.
@@ -219,7 +251,15 @@ class CodeCompletionStringChunk {
            Kind == ChunkKind::GenericParameterBegin ||
            Kind == ChunkKind::OptionalBegin ||
            Kind == ChunkKind::CallArgumentTypeBegin ||
-           Kind == ChunkKind::TypeAnnotationBegin;
+           Kind == ChunkKind::TypeAnnotationBegin ||
+           Kind == ChunkKind::ParameterDeclBegin ||
+           Kind == ChunkKind::ParameterDeclTypeBegin ||
+           Kind == ChunkKind::DefaultArgumentClauseBegin ||
+           Kind == ChunkKind::GenericParameterClauseBegin ||
+           Kind == ChunkKind::EffectsSpecifierClauseBegin ||
+           Kind == ChunkKind::DeclResultTypeClauseBegin ||
+           Kind == ChunkKind::GenericRequirementClauseBegin ||
+           Kind == ChunkKind::AttributeAndModifierListBegin;
   }
 
   static bool chunkHasText(ChunkKind Kind) {
@@ -249,11 +289,14 @@ class CodeCompletionStringChunk {
            Kind == ChunkKind::CallArgumentName ||
            Kind == ChunkKind::CallArgumentInternalName ||
            Kind == ChunkKind::CallArgumentColon ||
-           Kind == ChunkKind::DeclAttrParamColon ||
-           Kind == ChunkKind::DeclAttrParamKeyword ||
            Kind == ChunkKind::CallArgumentType ||
            Kind == ChunkKind::CallArgumentClosureType ||
            Kind == ChunkKind::CallArgumentClosureExpr ||
+           Kind == ChunkKind::ParameterDeclExternalName ||
+           Kind == ChunkKind::ParameterDeclLocalName ||
+           Kind == ChunkKind::ParameterDeclColon ||
+           Kind == ChunkKind::DeclAttrParamColon ||
+           Kind == ChunkKind::DeclAttrParamKeyword ||
            Kind == ChunkKind::GenericParameterName ||
            Kind == ChunkKind::DynamicLookupMethodCallTail ||
            Kind == ChunkKind::OptionalMethodCallTail ||
@@ -1053,17 +1096,20 @@ class PrintingCodeCompletionConsumer
   llvm::raw_ostream &OS;
   bool IncludeKeywords;
   bool IncludeComments;
+  bool IncludeSourceText;
   bool PrintAnnotatedDescription;
   bool RequiresSourceFileInfo = false;
 
 public:
  PrintingCodeCompletionConsumer(llvm::raw_ostream &OS,
                                 bool IncludeKeywords = true,
                                 bool IncludeComments = true,
+                                bool IncludeSourceText = false,
                                 bool PrintAnnotatedDescription = false)
      : OS(OS),
        IncludeKeywords(IncludeKeywords),
        IncludeComments(IncludeComments),
+       IncludeSourceText(IncludeSourceText),
        PrintAnnotatedDescription(PrintAnnotatedDescription) {}
 
   void handleResults(CodeCompletionContext &context) override;

include/swift/Parse/Parser.h

@@ -963,6 +963,8 @@ class Parser {
   /// \returns \c true if there was a parsing error.
   bool parseTopLevelSIL();
 
+  bool isStartOfGetSetAccessor();
+
   /// Flags that control the parsing of declarations.
   enum ParseDeclFlags {
     PD_Default              = 0,

include/swift/Runtime/Atomic.h

@@ -20,6 +20,9 @@
 #include "swift/Runtime/Config.h"
 #include <assert.h>
 #include <atomic>
+#if defined(_WIN64)
+#include <intrin.h>
+#endif
 
 // FIXME: Workaround for rdar://problem/18889711. 'Consume' does not require
 // a barrier on ARM64, but LLVM doesn't know that. Although 'relaxed'
@@ -72,7 +75,6 @@ class alignas(Size) atomic_impl {
 };
 
 #if defined(_WIN64)
-#include <intrin.h>
 
 /// MSVC's std::atomic uses an inline spin lock for 16-byte atomics,
 /// which is not only unnecessarily inefficient but also doubles the size

include/swift/Sema/ConstraintSystem.h

@@ -1735,9 +1735,9 @@ class SolutionApplicationTarget {
   }
 
   static SolutionApplicationTarget
-  forUninitializedVar(PatternBindingDecl *binding, unsigned index, Pattern *var,
+  forUninitializedVar(PatternBindingDecl *binding, unsigned index,
                       Type patternTy) {
-    return {binding, index, var, patternTy};
+    return {binding, index, binding->getPattern(index), patternTy};
   }
 
   /// Form a target for a synthesized property wrapper initializer.
@@ -4329,6 +4329,19 @@ class ConstraintSystem {
       llvm::function_ref<ConstraintFix *(unsigned, const OverloadChoice &)>
           getFix = [](unsigned, const OverloadChoice &) { return nullptr; });
 
+  /// Generate constraints for the given property that has an
+  /// attached property wrapper.
+  ///
+  /// \param wrappedVar The property that has a property wrapper.
+  /// \param initializerType The type of the initializer for the
+  ///        backing storage variable.
+  /// \param propertyType The type of the wrapped property.
+  ///
+  /// \returns true if there is an error.
+  bool generateWrappedPropertyTypeConstraints(VarDecl *wrappedVar,
+                                              Type initializerType,
+                                              Type propertyType);
+
   /// Propagate constraints in an effort to enforce local
   /// consistency to reduce the time to solve the system.
   ///

include/swift/Serialization/ModuleDependencyScanner.h

@@ -55,7 +55,7 @@ namespace swift {
           std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
           std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
           std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer,
-          bool IsFramework) override;
+          bool skipBuildingInterface, bool IsFramework) override;
 
       virtual void collectVisibleTopLevelModuleNames(
           SmallVectorImpl<Identifier> &names) const override {
@@ -117,7 +117,7 @@ namespace swift {
           std::unique_ptr<llvm::MemoryBuffer> *ModuleBuffer,
           std::unique_ptr<llvm::MemoryBuffer> *ModuleDocBuffer,
           std::unique_ptr<llvm::MemoryBuffer> *ModuleSourceInfoBuffer,
-                                                 bool IsFramework) override;
+          bool skipBuildingInterface, bool IsFramework) override;
 
       static bool classof(const ModuleDependencyScanner *MDS) {
         return MDS->getKind() == MDS_placeholder;