Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/Sema/CSSimplify.cpp

@@ -6292,7 +6292,7 @@ ConstraintSystem::simplifyApplicableFnConstraint(
 
   // Don't attempt this optimization in "diagnostic mode" because
   // in such mode we'd like to attempt all of the available
-  // overloads regardless of of problems related to missing or
+  // overloads regardless of problems related to missing or
   // extraneous labels and/or arguments.
   if (!(solverState && shouldAttemptFixes())) {
     // If the right-hand side is a type variable,

stdlib/public/core/Array.swift

@@ -1421,7 +1421,7 @@ extension Array {
   ///     of the new array.
   ///     - Parameters:
   ///       - buffer: A buffer covering uninitialized memory with room for the
-  ///         specified number of of elements.
+  ///         specified number of elements.
   ///       - initializedCount: The count of initialized elements in the array,
   ///         which begins as zero. Set `initializedCount` to the number of
   ///         elements you initialize.

stdlib/public/core/ContiguousArray.swift

@@ -1006,7 +1006,7 @@ extension ContiguousArray {
   ///     of the new array.
   ///     - Parameters:
   ///       - buffer: A buffer covering uninitialized memory with room for the
-  ///         specified number of of elements.
+  ///         specified number of elements.
   ///       - initializedCount: The count of initialized elements in the array,
   ///         which begins as zero. Set `initializedCount` to the number of
   ///         elements you initialize.

utils/api_checker/swift-api-checker.py

@@ -68,9 +68,11 @@ def prepare_module_list(platform, file, verbose, module_filter_flags,
                         include_fixed_clang_modules):
     cmd = [INFER_IMPORT_PATH, '-s', get_sdk_path(platform)]
     cmd.extend(module_filter_flags)
+    if platform.startswith('iosmac'):
+        cmd.extend(['--catalyst'])
     if verbose:
         cmd.extend(['--v'])
-    check_call(cmd, output=file)
+    check_call(cmd, verbose=verbose, output=file)
     # Always include fixed swift modules
     write_fixed_module(file, platform, 'swift', verbose)
     # Check if we need fixed clang modules