Merge pull request #4017 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

include/swift/Basic/LangOptions.h

@@ -283,6 +283,9 @@ namespace swift {
     /// Whether to dump debug info for request evaluator cycles.
     bool DebugDumpCycles = false;
 
+    /// Disable SIL substituted function types.
+    bool DisableSubstSILFunctionTypes = false;
+
     /// Whether to diagnose an ephemeral to non-ephemeral conversion as an
     /// error.
     bool DiagnoseInvalidEphemeralnessAsError = false;

include/swift/IDE/CodeCompletion.h

@@ -174,6 +174,9 @@ class CodeCompletionStringChunk {
     /// Argument type tag for annotated results.
     CallArgumentTypeBegin,
 
+    /// Added if the argument has a default value.
+    CallArgumentDefaultBegin,
+
     /// System type name.
     TypeIdSystem,
 
@@ -252,6 +255,7 @@ class CodeCompletionStringChunk {
            Kind == ChunkKind::GenericParameterBegin ||
            Kind == ChunkKind::OptionalBegin ||
            Kind == ChunkKind::CallArgumentTypeBegin ||
+           Kind == ChunkKind::CallArgumentDefaultBegin ||
            Kind == ChunkKind::TypeAnnotationBegin ||
            Kind == ChunkKind::ParameterDeclBegin ||
            Kind == ChunkKind::ParameterDeclTypeBegin ||
@@ -958,6 +962,9 @@ struct CodeCompletionResultSink {
   /// Whether to perform "call pettern heuristics".
   bool enableCallPatternHeuristics = false;
 
+  /// Whether to include an item without any default arguments.
+  bool addCallWithNoDefaultArgs = true;
+
   std::vector<CodeCompletionResult *> Results;
 
   /// A single-element cache for module names stored in Allocator, keyed by a
@@ -1050,6 +1057,13 @@ class CodeCompletionContext {
     return CurrentResults.enableCallPatternHeuristics;
   }
 
+  void setAddCallWithNoDefaultArgs(bool flag) {
+    CurrentResults.addCallWithNoDefaultArgs = flag;
+  }
+  bool addCallWithNoDefaultArgs() const {
+    return CurrentResults.addCallWithNoDefaultArgs;
+  }
+
   /// Allocate a string owned by the code completion context.
   StringRef copyString(StringRef Str);
 

include/swift/IDE/CodeCompletionCache.h

@@ -13,8 +13,9 @@
 #ifndef SWIFT_IDE_CODE_COMPLETIONCACHE_H
 #define SWIFT_IDE_CODE_COMPLETIONCACHE_H
 
-#include "swift/IDE/CodeCompletion.h"
 #include "swift/Basic/ThreadSafeRefCounted.h"
+#include "swift/IDE/CodeCompletion.h"
+#include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/Support/Chrono.h"
 #include <system_error>
@@ -43,17 +44,19 @@ class CodeCompletionCache {
     bool ForTestableLookup;
     bool ForPrivateImportLookup;
     bool AddInitsInToplevel;
+    bool AddCallWithNoDefaultArgs;
     bool Annotated;
 
     friend bool operator==(const Key &LHS, const Key &RHS) {
       return LHS.ModuleFilename == RHS.ModuleFilename &&
-        LHS.ModuleName == RHS.ModuleName &&
-        LHS.AccessPath == RHS.AccessPath &&
-        LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
-        LHS.ForTestableLookup == RHS.ForTestableLookup &&
-        LHS.ForPrivateImportLookup == RHS.ForPrivateImportLookup &&
-        LHS.AddInitsInToplevel == RHS.AddInitsInToplevel &&
-        LHS.Annotated == RHS.Annotated;
+             LHS.ModuleName == RHS.ModuleName &&
+             LHS.AccessPath == RHS.AccessPath &&
+             LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
+             LHS.ForTestableLookup == RHS.ForTestableLookup &&
+             LHS.ForPrivateImportLookup == RHS.ForPrivateImportLookup &&
+             LHS.AddInitsInToplevel == RHS.AddInitsInToplevel &&
+             LHS.AddCallWithNoDefaultArgs == RHS.AddCallWithNoDefaultArgs &&
+             LHS.Annotated == RHS.Annotated;
     }
   };
 
@@ -110,23 +113,18 @@ template<>
 struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
   using KeyTy = swift::ide::CodeCompletionCache::Key;
   static inline KeyTy getEmptyKey() {
-    return KeyTy{"", "", {}, false, false, false, false, false};
+    return KeyTy{"", "", {}, false, false, false, false, false, false};
   }
   static inline KeyTy getTombstoneKey() {
-    return KeyTy{"", "", {}, true, false, false, false, false};
+    return KeyTy{"", "", {}, true, false, false, false, false, false};
   }
   static unsigned getHashValue(const KeyTy &Val) {
-    size_t H = 0;
-    H ^= std::hash<std::string>()(Val.ModuleFilename);
-    H ^= std::hash<std::string>()(Val.ModuleName);
-    for (auto Piece : Val.AccessPath)
-      H ^= std::hash<std::string>()(Piece);
-    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);
+    return llvm::hash_combine(
+        Val.ModuleFilename, Val.ModuleName,
+        llvm::hash_combine_range(Val.AccessPath.begin(), Val.AccessPath.end()),
+        Val.ResultsHaveLeadingDot, Val.ForTestableLookup,
+        Val.ForPrivateImportLookup, Val.AddInitsInToplevel,
+        Val.AddCallWithNoDefaultArgs, Val.Annotated);
   }
   static bool isEqual(const KeyTy &LHS, const KeyTy &RHS) {
     return LHS == RHS;

include/swift/Option/FrontendOptions.td

@@ -476,6 +476,10 @@ def enable_experimental_static_assert :
   Flag<["-"], "enable-experimental-static-assert">,
   HelpText<"Enable experimental #assert">;
 
+def disable_subst_sil_function_types :
+  Flag<["-"], "disable-subst-sil-function-types">,
+  HelpText<"Disable substituted function types for SIL type lowering of function values">;
+
 def enable_experimental_named_opaque_types :
   Flag<["-"], "enable-experimental-named-opaque-types">,
   HelpText<"Enable experimental support for named opaque result types">;