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

Resolve conflicts with upstream `main`

Author: MaxDesiatov

include/swift-c/SyntaxParser/SwiftSyntaxCDataTypes.h

@@ -0,0 +1,76 @@
+//===------------------ SwiftSyntaxCDataTypes.h -------------------*- C -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+// There are two copies of this file in the Swift compiler repository and in  //
+// the SwiftSyntax repository. They need to always share the same contents.   //
+//                                                                            //
+// The reason behind this is that the SwiftSyntax module should be able to    //
+// build with no dependencies to the compiler repo (in particular not         //
+// _InternalSwiftSyntaxParser) so that it can be used for code generation     //
+// without a matching toolchain. But to make SwiftSyntax parsing efficient,   //
+// we need to create RawSyntax nodes from the C nodes without any conversion  //
+// and thus SwiftSyntax needs to have knowledge about the layout of these C   //
+// types. Thus the two copies of the file. The equality of these files is     //
+// checked in CI (verify the source matches) and at runtime by                //
+// SwiftSyntaxParser (verify that a hash generated from the layouts matches)  //
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_C_SYNTAX_C_DATA_TYPES_H
+#define SWIFT_C_SYNTAX_C_DATA_TYPES_H
+
+#include <stdbool.h>
+
+/// Offset+length in UTF8 bytes.
+typedef struct {
+  uint32_t offset;
+  uint32_t length;
+} swiftparse_range_t;
+
+typedef uint8_t swiftparse_trivia_kind_t;
+typedef uint8_t swiftparse_token_kind_t;
+typedef uint16_t swiftparse_syntax_kind_t;
+
+/// This is for the client to provide an opaque pointer that the parser will
+/// associate with a syntax node.
+typedef void *swiftparse_client_node_t;
+
+typedef struct {
+  /// The length in source this trivia piece occupies, in UTF8 bytes.
+  uint32_t length;
+  swiftparse_trivia_kind_t kind;
+} swiftparse_trivia_piece_t;
+
+typedef struct {
+  const swiftparse_trivia_piece_t *leading_trivia;
+  const swiftparse_trivia_piece_t *trailing_trivia;
+  uint16_t leading_trivia_count;
+  uint16_t trailing_trivia_count;
+  swiftparse_token_kind_t kind;
+  /// Represents the range for the node, including trivia.
+  swiftparse_range_t range;
+} swiftparse_token_data_t;
+
+typedef struct {
+  const swiftparse_client_node_t *nodes;
+  uint32_t nodes_count;
+} swiftparse_layout_data_t;
+
+typedef struct {
+  union {
+    swiftparse_token_data_t token_data;
+    swiftparse_layout_data_t layout_data;
+  };
+  /// The syntax kind. A value of '0' means this is a token node.
+  swiftparse_syntax_kind_t kind;
+  bool present;
+} swiftparse_syntax_node_t;
+
+#endif

include/swift-c/SyntaxParser/SwiftSyntaxParser.h

@@ -75,52 +75,7 @@
 
 SWIFTPARSE_BEGIN_DECLS
 
-//=== Syntax Data Types ---------------------------------------------------===//
-
-/// Offset+length in UTF8 bytes.
-typedef struct {
-  uint32_t offset;
-  uint32_t length;
-} swiftparse_range_t;
-
-typedef uint8_t swiftparse_trivia_kind_t;
-typedef uint8_t swiftparse_token_kind_t;
-typedef uint16_t swiftparse_syntax_kind_t;
-
-/// This is for the client to provide an opaque pointer that the parser will
-/// associate with a syntax node.
-typedef void *swiftparse_client_node_t;
-
-typedef struct {
-  /// The length in source this trivia piece occupies, in UTF8 bytes.
-  uint32_t length;
-  swiftparse_trivia_kind_t kind;
-} swiftparse_trivia_piece_t;
-
-typedef struct {
-  const swiftparse_trivia_piece_t *leading_trivia;
-  const swiftparse_trivia_piece_t *trailing_trivia;
-  uint16_t leading_trivia_count;
-  uint16_t trailing_trivia_count;
-  swiftparse_token_kind_t kind;
-  /// Represents the range for the node, including trivia.
-  swiftparse_range_t range;
-} swiftparse_token_data_t;
-
-typedef struct {
-  const swiftparse_client_node_t *nodes;
-  uint32_t nodes_count;
-} swiftparse_layout_data_t;
-
-typedef struct {
-  union {
-    swiftparse_token_data_t token_data;
-    swiftparse_layout_data_t layout_data;
-  };
-  /// The syntax kind. A value of '0' means this is a token node.
-  swiftparse_syntax_kind_t kind;
-  bool present;
-} swiftparse_syntax_node_t;
+#include "SwiftSyntaxCDataTypes.h"
 
 //=== Parser Functions ----------------------------------------------------===//
 

include/swift/AST/DiagnosticsParse.def

@@ -1747,6 +1747,9 @@ ERROR(unsupported_platform_condition_expression,none,
       "unexpected platform condition "
       "(expected 'os', 'arch', or 'swift')",
       ())
+ERROR(platform_condition_expected_argument,none,
+      "expected argument to platform condition",
+      ())
 ERROR(platform_condition_expected_one_argument,none,
       "expected only one argument to platform condition",
       ())

include/swift/Basic/LangOptions.h

@@ -230,14 +230,6 @@ namespace swift {
     /// Keep comments during lexing and attach them to declarations.
     bool AttachCommentsToDecls = false;
 
-    /// Whether to include initializers when code-completing a postfix
-    /// expression.
-    bool CodeCompleteInitsInPostfixExpr = false;
-
-    /// Whether to use heuristics to decide whether to show call-pattern
-    /// completions.
-    bool CodeCompleteCallPatternHeuristics = false;
-
     ///
     /// Flags for use by tests
     ///

include/swift/IDE/CodeCompletion.h

@@ -947,6 +947,13 @@ struct CodeCompletionResultSink {
   /// Whether to emit object literals if desired.
   bool includeObjectLiterals = true;
 
+  /// Whether to emit type initializers in addition to type names in expression
+  /// position.
+  bool addInitsToTopLevel = false;
+
+  /// Whether to perform "call pettern heuristics".
+  bool enableCallPatternHeuristics = false;
+
   std::vector<CodeCompletionResult *> Results;
 
   /// A single-element cache for module names stored in Allocator, keyed by a
@@ -1021,7 +1028,23 @@ class CodeCompletionContext {
   void setIncludeObjectLiterals(bool flag) {
     CurrentResults.includeObjectLiterals = flag;
   }
-  bool includeObjectLiterals() { return CurrentResults.includeObjectLiterals; }
+  bool includeObjectLiterals() const {
+    return CurrentResults.includeObjectLiterals;
+  }
+
+  void setAddInitsToTopLevel(bool flag) {
+    CurrentResults.addInitsToTopLevel = flag;
+  }
+  bool getAddInitsToTopLevel() const {
+    return CurrentResults.addInitsToTopLevel;
+  }
+
+  void setCallPatternHeuristics(bool flag) {
+    CurrentResults.enableCallPatternHeuristics = flag;
+  }
+  bool getCallPatternHeuristics() const {
+    return CurrentResults.enableCallPatternHeuristics;
+  }
 
   /// Allocate a string owned by the code completion context.
   StringRef copyString(StringRef Str);

include/swift/IDE/CodeCompletionCache.h

@@ -42,7 +42,7 @@ class CodeCompletionCache {
     bool ResultsHaveLeadingDot;
     bool ForTestableLookup;
     bool ForPrivateImportLookup;
-    bool CodeCompleteInitsInPostfixExpr;
+    bool AddInitsInToplevel;
     bool Annotated;
 
     friend bool operator==(const Key &LHS, const Key &RHS) {
@@ -52,7 +52,8 @@ class CodeCompletionCache {
         LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
         LHS.ForTestableLookup == RHS.ForTestableLookup &&
         LHS.ForPrivateImportLookup == RHS.ForPrivateImportLookup &&
-        LHS.CodeCompleteInitsInPostfixExpr == RHS.CodeCompleteInitsInPostfixExpr;
+        LHS.AddInitsInToplevel == RHS.AddInitsInToplevel &&
+        LHS.Annotated == RHS.Annotated;
     }
   };
 
@@ -123,6 +124,7 @@ struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
     H ^= std::hash<bool>()(Val.ResultsHaveLeadingDot);
     H ^= std::hash<bool>()(Val.ForTestableLookup);
     H ^= std::hash<bool>()(Val.ForPrivateImportLookup);
+    H ^= std::hash<bool>()(Val.AddInitsInToplevel);
     H ^= std::hash<bool>()(Val.Annotated);
     return static_cast<unsigned>(H);
   }

lib/AST/GenericSignature.cpp

@@ -539,7 +539,7 @@ Type GenericSignatureImpl::getSuperclassBound(Type type) const {
 
   auto computeViaRQM = [&]() {
     auto *machine = getRequirementMachine();
-    return machine->getSuperclassBound(type);
+    return machine->getSuperclassBound(type, getGenericParams());
   };
 
   auto &ctx = getASTContext();
@@ -772,7 +772,7 @@ Type GenericSignatureImpl::getConcreteType(Type type) const {
 
   auto computeViaRQM = [&]() {
     auto *machine = getRequirementMachine();
-    return machine->getConcreteType(type);
+    return machine->getConcreteType(type, getGenericParams());
   };
 
   auto &ctx = getASTContext();

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -139,7 +139,9 @@ RequirementMachine::getRequiredProtocols(Type depType) const {
   return result;
 }
 
-Type RequirementMachine::getSuperclassBound(Type depType) const {
+Type RequirementMachine::
+getSuperclassBound(Type depType,
+                   TypeArrayView<GenericTypeParamType> genericParams) const {
   auto term = Context.getMutableTermForType(depType->getCanonicalType(),
                                             /*proto=*/nullptr);
   System.simplify(term);
@@ -153,7 +155,7 @@ Type RequirementMachine::getSuperclassBound(Type depType) const {
     return Type();
 
   auto &protos = System.getProtocols();
-  return props->getSuperclassBound({ }, term, protos, Context);
+  return props->getSuperclassBound(genericParams, term, protos, Context);
 }
 
 bool RequirementMachine::isConcreteType(Type depType) const {
@@ -169,7 +171,9 @@ bool RequirementMachine::isConcreteType(Type depType) const {
   return props->isConcreteType();
 }
 
-Type RequirementMachine::getConcreteType(Type depType) const {
+Type RequirementMachine::
+getConcreteType(Type depType,
+                TypeArrayView<GenericTypeParamType> genericParams) const {
   auto term = Context.getMutableTermForType(depType->getCanonicalType(),
                                             /*proto=*/nullptr);
   System.simplify(term);
@@ -183,7 +187,7 @@ Type RequirementMachine::getConcreteType(Type depType) const {
     return Type();
 
   auto &protos = System.getProtocols();
-  return props->getConcreteType({ }, term, protos, Context);
+  return props->getConcreteType(genericParams, term, protos, Context);
 }
 
 bool RequirementMachine::areSameTypeParameterInContext(Type depType1,

lib/AST/RequirementMachine/RequirementMachine.h

@@ -98,9 +98,11 @@ class RequirementMachine final {
   LayoutConstraint getLayoutConstraint(Type depType) const;
   bool requiresProtocol(Type depType, const ProtocolDecl *proto) const;
   GenericSignature::RequiredProtocols getRequiredProtocols(Type depType) const;
-  Type getSuperclassBound(Type depType) const;
+  Type getSuperclassBound(Type depType,
+                          TypeArrayView<GenericTypeParamType> genericParams) const;
   bool isConcreteType(Type depType) const;
-  Type getConcreteType(Type depType) const;
+  Type getConcreteType(Type depType,
+                       TypeArrayView<GenericTypeParamType> genericParams) const;
   bool areSameTypeParameterInContext(Type depType1, Type depType2) const;
   bool isCanonicalTypeInContext(Type type) const;
   Type getCanonicalTypeInContext(Type type,

lib/DriverTool/autolink_extract_main.cpp

@@ -147,14 +147,13 @@ extractLinkerFlagsFromObjectFile(const llvm::object::ObjectFile *ObjectFile,
   return false;
 }
 
-/// Look inside the object file 'WasmObjectFile' and append any linker flags found in
-/// its ".swift1_autolink_entries" section to 'LinkerFlags'.
-/// Return 'true' if there was an error, and 'false' otherwise.
+/// Look inside the object file 'WasmObjectFile' and append any linker flags
+/// found in its ".swift1_autolink_entries" section to 'LinkerFlags'. Return
+/// 'true' if there was an error, and 'false' otherwise.
 static bool
 extractLinkerFlagsFromObjectFile(const llvm::object::WasmObjectFile *ObjectFile,
                                  std::vector<std::string> &LinkerFlags,
                                  CompilerInstance &Instance) {
-
   // Search for the data segment we hold autolink entries in
   for (const llvm::object::WasmSegment &Segment : ObjectFile->dataSegments()) {
     if (Segment.Data.Name == ".swift1_autolink_entries") {
@@ -164,7 +163,7 @@ extractLinkerFlagsFromObjectFile(const llvm::object::WasmObjectFile *ObjectFile,
       // the set.
       llvm::SmallVector<llvm::StringRef, 4> SplitFlags;
       SegmentData.split(SplitFlags, llvm::StringRef("\0", 1), -1,
-                         /*KeepEmpty=*/false);
+                        /*KeepEmpty=*/false);
       for (const auto &Flag : SplitFlags)
         LinkerFlags.push_back(Flag.str());
     }
@@ -182,7 +181,8 @@ static bool extractLinkerFlags(const llvm::object::Binary *Bin,
                                std::vector<std::string> &LinkerFlags) {
   if (auto *ObjectFile = llvm::dyn_cast<llvm::object::ELFObjectFileBase>(Bin)) {
     return extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags, Instance);
-  } else if (auto *ObjectFile = llvm::dyn_cast<llvm::object::WasmObjectFile>(Bin)) {
+  } else if (auto *ObjectFile =
+                 llvm::dyn_cast<llvm::object::WasmObjectFile>(Bin)) {
     return extractLinkerFlagsFromObjectFile(ObjectFile, LinkerFlags, Instance);
   } else if (auto *Archive = llvm::dyn_cast<llvm::object::Archive>(Bin)) {
     llvm::Error Error = llvm::Error::success();