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

Author: swift-ci

utils/swift_build_support/swift_build_support/products/wasisysroot.py

@@ -58,20 +58,11 @@ def _build(self, host_target, thread_model='single', target_triple='wasm32-wasi'
 
         sysroot_build_dir = WASILibc.sysroot_build_path(
             build_root, host_target, target_triple)
-        # FIXME: Manually create an empty dir that is usually created during
-        # check-symbols. The directory is required during sysroot installation step.
-        os.makedirs(os.path.join(sysroot_build_dir, "share"), exist_ok=True)
 
         sysroot_install_path = WASILibc.sysroot_install_path(build_root, target_triple)
         shell.call([
             'make', 'install',
             '-j', str(build_jobs),
-            # FIXME: wasi-libc's pre-defined macro list does not expect
-            # `__FPCLASS_XXX`, which is introduced by the LLVM 17, yet.
-            # So skip the symbol check step by treating the phony target
-            # as very old file.
-            # https://github.com/llvm/llvm-project/commit/7dd387d2971d7759cadfffeb2082439f6c7ddd49
-            '--old-file=check-symbols',
             '-C', self.source_dir,
             'OBJDIR=' + os.path.join(self.build_dir, 'obj-' + thread_model),
             'SYSROOT=' + sysroot_build_dir,

utils/update_checkout/update_checkout/update_checkout.py

@@ -16,6 +16,7 @@
 import sys
 import traceback
 from multiprocessing import Lock, Pool, cpu_count, freeze_support
+from typing import Optional
 
 from build_swift.build_swift.constants import SWIFT_SOURCE_ROOT
 
@@ -74,7 +75,7 @@ def check_parallel_results(results, op):
     return fail_count
 
 
-def confirm_tag_in_repo(tag, repo_name):
+def confirm_tag_in_repo(tag, repo_name) -> Optional[str]:
     # type: (str, str) -> str | None
     """Confirm that a given tag exists in a git repository. This function
     assumes that the repository is already a current working directory before