Merge pull request #3574 from swiftwasm/main

Author: MaxDesiatov

benchmark/single-source/MapReduce.swift

@@ -77,7 +77,7 @@ public func run_MapReduce(_ n: Int) {
   var c = 0
   for _ in 1...n*100 {
     numbers = numbers.map { $0 &+ 5 }
-    c += numbers.reduce(0, &+)
+    c = c &+ numbers.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -89,7 +89,7 @@ public func run_MapReduceAnyCollection(_ n: Int) {
   var c = 0
   for _ in 1...n*100 {
     let mapped = numbers.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -101,7 +101,7 @@ public func run_MapReduceAnyCollectionShort(_ n: Int) {
   var c = 0
   for _ in 1...n*1_000 {
     let mapped = numbers.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -113,7 +113,7 @@ public func run_MapReduceShort(_ n: Int) {
   var c = 0
   for _ in 1...n*1_000 {
     numbers = numbers.map { $0 &+ 5 }
-    c += numbers.reduce(0, &+)
+    c = c &+ numbers.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -125,7 +125,7 @@ public func run_MapReduceSequence(_ n: Int) {
   var c = 0
   for _ in 1...n*100 {
     let mapped = numbers.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -137,7 +137,7 @@ public func run_MapReduceLazySequence(_ n: Int) {
   var c = 0
   for _ in 1...n*100 {
     let mapped = numbers.lazy.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -149,7 +149,7 @@ public func run_MapReduceLazyCollection(_ n: Int) {
   var c = 0
   for _ in 1...n*100 {
     let mapped = numbers.lazy.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -161,7 +161,7 @@ public func run_MapReduceLazyCollectionShort(_ n: Int) {
   var c = 0
   for _ in 1...n*10000 {
     let mapped = numbers.lazy.map { $0 &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -172,7 +172,7 @@ public func run_MapReduceString(_ n: Int) {
 
   var c: UInt64 = 0
   for _ in 1...n*100 {
-    c += s.utf8.map { UInt64($0 &+ 5) }.reduce(0, &+)
+    c = c &+ s.utf8.map { UInt64($0 &+ 5) }.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -183,7 +183,7 @@ public func run_MapReduceShortString(_ n: Int) {
 
   var c: UInt64 = 0
   for _ in 1...n*100 {
-    c += s.utf8.map { UInt64($0 &+ 5) }.reduce(0, &+)
+    c = c &+ s.utf8.map { UInt64($0 &+ 5) }.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -196,7 +196,7 @@ public func run_MapReduceNSDecimalNumber(_ n: Int) {
   var c = 0
   for _ in 1...n*10 {
     let mapped = numbers.map { $0.intValue &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 #endif
@@ -210,7 +210,7 @@ public func run_MapReduceNSDecimalNumberShort(_ n: Int) {
   var c = 0
   for _ in 1...n*1_000 {
     let mapped = numbers.map { $0.intValue &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 #endif
@@ -224,7 +224,7 @@ public func run_MapReduceClass(_ n: Int) {
   var c = 0
   for _ in 1...n*10 {
     let mapped = numbers.map { $0.v &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }
@@ -236,7 +236,7 @@ public func run_MapReduceClassShort(_ n: Int) {
   var c = 0
   for _ in 1...n*1_000 {
     let mapped = numbers.map { $0.v &+ 5 }
-    c += mapped.reduce(0, &+)
+    c = c &+ mapped.reduce(0, &+)
   }
   check(c != 0)
 }

cmake/modules/AddSwift.cmake

@@ -724,10 +724,15 @@ endfunction()
 # This is a temporary workaround until it's possible to compile libswift with
 # cmake's builtin swift support.
 function(add_libswift name)
+  set(libswift_compile_options
+      "-target" "x86_64-apple-macosx10.15" # TODO: remove this once #38675 lands.
+      "-Xfrontend" "-validate-tbd-against-ir=none"
+      "-Xfrontend" "-enable-cxx-interop")
+
   if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(libswift_compile_options "-g")
+    list(APPEND libswift_compile_options "-g")
   else()
-    set(libswift_compile_options "-O" "-cross-module-optimization")
+    list(APPEND libswift_compile_options "-O" "-cross-module-optimization")
   endif()
 
   set(build_dir ${CMAKE_CURRENT_BINARY_DIR})

include/swift-c/DependencyScan/DependencyScan.h

@@ -203,6 +203,9 @@ swiftscan_clang_detail_get_context_hash(swiftscan_module_details_t details);
 SWIFTSCAN_PUBLIC swiftscan_string_set_t *
 swiftscan_clang_detail_get_command_line(swiftscan_module_details_t details);
 
+SWIFTSCAN_PUBLIC swiftscan_string_set_t *
+swiftscan_clang_detail_get_captured_pcm_args(swiftscan_module_details_t details);
+
 //=== Batch Scan Input Functions ------------------------------------------===//
 
 /// Create an \c swiftscan_batch_scan_input_t instance.

include/swift/AST/DiagnosticsModuleDiffer.def

@@ -88,7 +88,7 @@ ERROR(not_inheriting_convenience_inits,APIDigesterBreakage,"%0 no longer inherit
 
 ERROR(enum_case_added,APIDigesterBreakage,"%0 has been added as a new enum case", (StringRef))
 
-ERROR(demangled_name_changed,APIDigesterBreakage,"%0 has mangled name changing from '%1' to '%2'", (StringRef, StringRef, StringRef))
+WARNING(demangled_name_changed,APIDigesterBreakage,"%0 has mangled name changing from '%1' to '%2'", (StringRef, StringRef, StringRef))
 
 WARNING(cannot_read_allowlist,none,"cannot read breakage allowlist at '%0'", (StringRef))
 

include/swift/AST/DiagnosticsSIL.def

@@ -676,9 +676,9 @@ WARNING(semantic_function_improper_nesting, none, "'@_semantics' function calls
 
 // Capture promotion diagnostics
 WARNING(capturepromotion_concurrentcapture_mutation, none,
-        "'%0' mutated after capture by concurrent closure", (StringRef))
+        "'%0' mutated after capture by sendable closure", (StringRef))
 NOTE(capturepromotion_concurrentcapture_closure_here, none,
-     "variable captured by concurrent closure", ())
+     "variable captured by sendable closure", ())
 NOTE(capturepromotion_concurrentcapture_capturinguse_here, none,
      "capturing use", ())
 NOTE(capturepromotion_variable_defined_here,none,

include/swift/AST/DiagnosticsSema.def

@@ -3883,28 +3883,28 @@ NOTE(silence_debug_description_in_interpolation_segment_call,none,
      "use 'String(describing:)' to silence this warning", ())
 
 NOTE(noescape_parameter,none,
-    "parameter %1 is implicitly %select{non-escaping|non-concurrent}0",
+    "parameter %1 is implicitly %select{non-escaping|non-sendable}0",
      (unsigned, Identifier))
 NOTE(generic_parameters_always_escaping,none,
      "generic parameters are always considered '@escaping'", ())
 
 ERROR(passing_noattrfunc_to_attrfunc,none,
-      "passing %select{non-escaping|non-concurrent}0 parameter %1 to function "
+      "passing %select{non-escaping|non-sendable}0 parameter %1 to function "
       "expecting %select{an @escaping|a @Sendable}0 closure",
       (unsigned, Identifier))
 ERROR(converting_noespace_param_to_generic_type,none,
       "converting non-escaping parameter %0 to generic parameter %1 may allow it to escape",
       (Identifier, Type))
 ERROR(assigning_noattrfunc_to_attrfunc,none,
-      "assigning %select{non-escaping|non-concurrent}0 parameter %1 to "
+      "assigning %select{non-escaping|non-sendable}0 parameter %1 to "
       "%select{an @escaping|a @Sendable}0 closure",
       (unsigned, Identifier))
 ERROR(general_noattrfunc_to_attr,none,
-      "using %select{non-escaping|non-concurrent}0 parameter %1 in a context "
+      "using %select{non-escaping|non-sendable}0 parameter %1 in a context "
       "expecting %select{an @escaping|a @Sendable}0 closure",
       (unsigned, Identifier))
 ERROR(converting_noattrfunc_to_type,none,
-      "converting %select{non-escaping|non-concurrent function}0 value to %1 "
+      "converting %select{non-escaping|non-sendable function}0 value to %1 "
       "may %select{allow it to escape|introduce data races}0",
       (unsigned, Type))
 NOTE(escape_expected_at_parameter_position,none,

include/swift/AST/ModuleDependencies.h

@@ -247,16 +247,22 @@ class ClangModuleDependenciesStorage : public ModuleDependenciesStorageBase {
   /// The file dependencies
   const std::vector<std::string> fileDependencies;
 
+  /// The swift-specific PCM arguments captured by this dependencies object
+  /// as found by the scanning action that discovered it
+  const std::vector<std::string> capturedPCMArgs;
+
   ClangModuleDependenciesStorage(
       const std::string &moduleMapFile,
       const std::string &contextHash,
       const std::vector<std::string> &nonPathCommandLine,
-      const std::vector<std::string> &fileDependencies
+      const std::vector<std::string> &fileDependencies,
+      const std::vector<std::string> &capturedPCMArgs
   ) : ModuleDependenciesStorageBase(ModuleDependenciesKind::Clang),
       moduleMapFile(moduleMapFile),
       contextHash(contextHash),
       nonPathCommandLine(nonPathCommandLine),
-      fileDependencies(fileDependencies) { }
+      fileDependencies(fileDependencies),
+      capturedPCMArgs(capturedPCMArgs) {}
 
   ModuleDependenciesStorageBase *clone() const override {
     return new ClangModuleDependenciesStorage(*this);
@@ -361,10 +367,12 @@ class ModuleDependencies {
       const std::string &moduleMapFile,
       const std::string &contextHash,
       const std::vector<std::string> &nonPathCommandLine,
-      const std::vector<std::string> &fileDependencies) {
+      const std::vector<std::string> &fileDependencies,
+      const std::vector<std::string> &capturedPCMArgs) {
     return ModuleDependencies(
         std::make_unique<ClangModuleDependenciesStorage>(
-          moduleMapFile, contextHash, nonPathCommandLine, fileDependencies));
+          moduleMapFile, contextHash, nonPathCommandLine,
+          fileDependencies, capturedPCMArgs));
   }
 
   /// Describe a placeholder dependency swift module.

include/swift/DependencyScan/DependencyScanImpl.h

@@ -129,6 +129,9 @@ typedef struct {
 
   /// Options to the compile command required to build this clang modulemap
   swiftscan_string_set_t *command_line;
+
+  /// The swift-specific PCM arguments captured by this dependencies object
+  swiftscan_string_set_t *captured_pcm_args;
 } swiftscan_clang_details_t;
 
 struct swiftscan_module_details_s {

include/swift/DependencyScan/SerializedModuleDependencyCacheFormat.h

@@ -46,7 +46,6 @@ const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 0;
 using IdentifierIDField = BCVBR<13>;
 using FileIDField = IdentifierIDField;
 using ModuleIDField = IdentifierIDField;
-using CompilerFlagField = IdentifierIDField;
 using ContextHashField = IdentifierIDField;
 
 /// A bit that indicates whether or not a module is a framework
@@ -166,7 +165,8 @@ using ClangModuleDetailsLayout =
                    FileIDField,               // moduleMapPath
                    ContextHashField,          // contextHash
                    FlagIDArrayIDField,        // commandLine
-                   FileIDArrayIDField         // fileDependencies
+                   FileIDArrayIDField,        // fileDependencies
+                   FlagIDArrayIDField         // capturedPCMArgs
                    >;
 } // namespace graph_block
 

include/swift/Runtime/Concurrent.h

@@ -63,7 +63,7 @@ template <class ElemTy> struct ConcurrentList {
 
   /// Remove all of the links in the chain. This method leaves
   /// the list at a usable state and new links can be added.
-  /// Notice that this operation is non-concurrent because
+  /// Notice that this operation is non-sendable because
   /// we have no way of ensuring that no one is currently
   /// traversing the list.
   void clear() {

include/swift/SIL/SILBridging.h

@@ -15,10 +15,7 @@
 
 #include "BridgedSwiftObject.h"
 #include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <string>
 
 typedef struct {
   const unsigned char * _Nullable data;
@@ -155,17 +152,17 @@ BridgedSlab PassContext_freeSlab(BridgedPassContext passContext,
                                  BridgedSlab slab);
 
 BridgedStringRef SILFunction_getName(BridgedFunction function);
-BridgedStringRef SILFunction_debugDescription(BridgedFunction function);
+std::string SILFunction_debugDescription(BridgedFunction function);
 OptionalBridgedBasicBlock SILFunction_firstBlock(BridgedFunction function);
 OptionalBridgedBasicBlock SILFunction_lastBlock(BridgedFunction function);
 
 BridgedStringRef SILGlobalVariable_getName(BridgedGlobalVar global);
-BridgedStringRef SILGlobalVariable_debugDescription(BridgedGlobalVar global);
+std::string SILGlobalVariable_debugDescription(BridgedGlobalVar global);
 
 OptionalBridgedBasicBlock SILBasicBlock_next(BridgedBasicBlock block);
 OptionalBridgedBasicBlock SILBasicBlock_previous(BridgedBasicBlock block);
 BridgedFunction SILBasicBlock_getFunction(BridgedBasicBlock block);
-BridgedStringRef SILBasicBlock_debugDescription(BridgedBasicBlock block);
+std::string SILBasicBlock_debugDescription(BridgedBasicBlock block);
 OptionalBridgedInstruction SILBasicBlock_firstInst(BridgedBasicBlock block);
 OptionalBridgedInstruction SILBasicBlock_lastInst(BridgedBasicBlock block);
 SwiftInt SILBasicBlock_getNumArguments(BridgedBasicBlock block);
@@ -179,7 +176,7 @@ BridgedValue Operand_getValue(BridgedOperand);
 OptionalBridgedOperand Operand_nextUse(BridgedOperand);
 BridgedInstruction Operand_getUser(BridgedOperand);
 
-BridgedStringRef SILNode_debugDescription(BridgedNode node);
+std::string SILNode_debugDescription(BridgedNode node);
 OptionalBridgedOperand SILValue_firstUse(BridgedValue value);
 BridgedType SILValue_getType(BridgedValue value);
 
@@ -227,8 +224,4 @@ BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
 BridgedInstruction SILBuilder_createCondFail(BridgedInstruction insertionPoint,
           BridgedLocation loc, BridgedValue condition, BridgedStringRef messge);
 
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
 #endif

include/swift/Sema/ConstraintSystem.h

@@ -768,8 +768,18 @@ enum ScoreKind {
   SK_ValueToPointerConversion,
   /// A closure/function conversion to an autoclosure parameter.
   SK_FunctionToAutoClosureConversion,
-
-  SK_LastScoreKind = SK_FunctionToAutoClosureConversion,
+  /// An unapplied reference to a function. The purpose of this
+  /// score bit is to prune overload choices that are functions
+  /// when a solution has already been found using property.
+  ///
+  /// \Note The solver only prefers variables over functions
+  /// to resolve ambiguities, so please be sure that any score
+  /// kind added after this is truly less impactful. Only other
+  /// ambiguity tie-breakers should go after this; anything else
+  /// should be added above.
+  SK_UnappliedFunction,
+
+  SK_LastScoreKind = SK_UnappliedFunction,
 };
 
 /// The number of score kinds.

lib/AST/ClangTypeConverter.cpp

@@ -865,7 +865,6 @@ ClangTypeConverter::getClangTemplateArguments(
     ArrayRef<Type> genericArgs,
     SmallVectorImpl<clang::TemplateArgument> &templateArgs) {
   assert(templateArgs.size() == 0);
-  assert(genericArgs.size() == templateParams->size());
 
   // Keep track of the types we failed to convert so we can return a useful
   // error.
@@ -874,6 +873,13 @@ ClangTypeConverter::getClangTemplateArguments(
     // Note: all template parameters must be template type parameters. This is
     // verified when we import the Clang decl.
     auto templateParam = cast<clang::TemplateTypeParmDecl>(param);
+    // We must have found a defaulted parameter at the end of the list.
+    if (templateParam->getIndex() >= genericArgs.size()) {
+      templateArgs.push_back(
+          clang::TemplateArgument(templateParam->getDefaultArgument()));
+      continue;
+    }
+
     auto replacement = genericArgs[templateParam->getIndex()];
     auto qualType = convert(replacement);
     if (qualType.isNull()) {