Rebase, fix conflicts and issues with latest main from Dec. 17

Author: luispadron

MODULE.bazel

@@ -14,10 +14,10 @@ bazel_dep(name = "apple_support", version = "1.24.2", repo_name = "build_bazel_a
 bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_shell", version = "0.3.0")
 bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "30.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "com_github_nlohmann_json")
 bazel_dep(name = "abseil-cpp", version = "20250127.0")
-bazel_dep(name = "re2", version = "2024-07-02")
+bazel_dep(name = "re2", version = "2025-11-05")
 bazel_dep(
     name = "swift_argument_parser",
     version = "1.3.1.2",

doc/providers.md

@@ -110,11 +110,12 @@ Propagates Swift-specific information about a `proto_library`.
 
 <pre>
 SwiftToolchainInfo(<a href="#SwiftToolchainInfo-action_configs">action_configs</a>, <a href="#SwiftToolchainInfo-cc_language">cc_language</a>, <a href="#SwiftToolchainInfo-cc_toolchain_info">cc_toolchain_info</a>, <a href="#SwiftToolchainInfo-clang_implicit_deps_providers">clang_implicit_deps_providers</a>,
-                   <a href="#SwiftToolchainInfo-const_protocols_to_gather">const_protocols_to_gather</a>, <a href="#SwiftToolchainInfo-cross_import_overlays">cross_import_overlays</a>, <a href="#SwiftToolchainInfo-debug_outputs_provider">debug_outputs_provider</a>,
-                   <a href="#SwiftToolchainInfo-developer_dirs">developer_dirs</a>, <a href="#SwiftToolchainInfo-entry_point_linkopts_provider">entry_point_linkopts_provider</a>, <a href="#SwiftToolchainInfo-feature_allowlists">feature_allowlists</a>,
-                   <a href="#SwiftToolchainInfo-generated_header_module_implicit_deps_providers">generated_header_module_implicit_deps_providers</a>, <a href="#SwiftToolchainInfo-implicit_deps_providers">implicit_deps_providers</a>,
-                   <a href="#SwiftToolchainInfo-module_aliases">module_aliases</a>, <a href="#SwiftToolchainInfo-package_configurations">package_configurations</a>, <a href="#SwiftToolchainInfo-requested_features">requested_features</a>, <a href="#SwiftToolchainInfo-root_dir">root_dir</a>, <a href="#SwiftToolchainInfo-swift_worker">swift_worker</a>,
-                   <a href="#SwiftToolchainInfo-test_configuration">test_configuration</a>, <a href="#SwiftToolchainInfo-tool_configs">tool_configs</a>, <a href="#SwiftToolchainInfo-unsupported_features">unsupported_features</a>)
+                   <a href="#SwiftToolchainInfo-codegen_batch_size">codegen_batch_size</a>, <a href="#SwiftToolchainInfo-const_protocols_to_gather">const_protocols_to_gather</a>, <a href="#SwiftToolchainInfo-cross_import_overlays">cross_import_overlays</a>,
+                   <a href="#SwiftToolchainInfo-debug_outputs_provider">debug_outputs_provider</a>, <a href="#SwiftToolchainInfo-developer_dirs">developer_dirs</a>, <a href="#SwiftToolchainInfo-entry_point_linkopts_provider">entry_point_linkopts_provider</a>,
+                   <a href="#SwiftToolchainInfo-feature_allowlists">feature_allowlists</a>, <a href="#SwiftToolchainInfo-generated_header_module_implicit_deps_providers">generated_header_module_implicit_deps_providers</a>,
+                   <a href="#SwiftToolchainInfo-implicit_deps_providers">implicit_deps_providers</a>, <a href="#SwiftToolchainInfo-module_aliases">module_aliases</a>, <a href="#SwiftToolchainInfo-package_configurations">package_configurations</a>,
+                   <a href="#SwiftToolchainInfo-requested_features">requested_features</a>, <a href="#SwiftToolchainInfo-root_dir">root_dir</a>, <a href="#SwiftToolchainInfo-swift_worker">swift_worker</a>, <a href="#SwiftToolchainInfo-test_configuration">test_configuration</a>, <a href="#SwiftToolchainInfo-tool_configs">tool_configs</a>,
+                   <a href="#SwiftToolchainInfo-unsupported_features">unsupported_features</a>)
 </pre>
 
 Propagates information about a Swift toolchain to compilation and linking rules
@@ -128,6 +129,7 @@ that use the toolchain.
 | <a id="SwiftToolchainInfo-cc_language"></a>cc_language |  The `language` that should be passed to `cc_common` APIs that take it as an argument.    |
 | <a id="SwiftToolchainInfo-cc_toolchain_info"></a>cc_toolchain_info |  The `cc_common.CcToolchainInfo` provider from the Bazel C++ toolchain that this Swift toolchain depends on.    |
 | <a id="SwiftToolchainInfo-clang_implicit_deps_providers"></a>clang_implicit_deps_providers |  A `struct` with the following fields, which represent providers from targets that should be added as implicit dependencies of any precompiled explicit C/Objective-C modules:<br><br>*   `cc_infos`: A list of `CcInfo` providers from targets specified as the     toolchain's implicit dependencies.<br><br>*   `swift_infos`: A list of `SwiftInfo` providers from targets specified as the     toolchain's implicit dependencies.<br><br>For ease of use, this field is never `None`; it will always be a valid `struct` containing the fields described above, even if those lists are empty.    |
+| <a id="SwiftToolchainInfo-codegen_batch_size"></a>codegen_batch_size |  The number of files to pass to the compiler in a single code generation action (one that compiles object files from Swift source files).    |
 | <a id="SwiftToolchainInfo-const_protocols_to_gather"></a>const_protocols_to_gather |  `File`. A JSON file specifying a list of protocols for extraction of conformances' const values.    |
 | <a id="SwiftToolchainInfo-cross_import_overlays"></a>cross_import_overlays |  A list of `SwiftCrossImportOverlayInfo` providers whose `SwiftInfo` providers will be automatically injected into the dependencies of Swift compilations if their declaring module and bystanding module are both already declared as dependencies.    |
 | <a id="SwiftToolchainInfo-debug_outputs_provider"></a>debug_outputs_provider |  An optional function that provides toolchain-specific logic around the handling of additional debug outputs for `swift_binary` and `swift_test` targets.<br><br>If specified, this function must take the following keyword arguments:<br><br>*   `ctx`: The rule context of the calling binary or test rule.<br><br>It must return a `struct` with the following fields:<br><br>*   `additional_outputs`: Additional outputs expected from the linking action.<br><br>*   `variables_extension`: A dictionary of additional crosstool variables to     pass to the linking action.    |

swift/internal/BUILD

@@ -316,6 +316,7 @@ bzl_library(
 bzl_library(
     name = "optimization",
     srcs = ["optimization.bzl"],
+    visibility = ["//swift:__subpackages__"],
     deps = [
         ":feature_names",
     ],

swift/internal/compiling.bzl

@@ -38,9 +38,6 @@ load(":actions.bzl", "is_action_enabled", "run_toolchain_action")
 load(":explicit_module_map_file.bzl", "write_explicit_swift_module_map_file")
 load(
     ":feature_names.bzl",
-    "SWIFT_FEATURE__NUM_THREADS_0_IN_SWIFTCOPTS",
-    "SWIFT_FEATURE__OPT_IN_SWIFTCOPTS",
-    "SWIFT_FEATURE__WMO_IN_SWIFTCOPTS",
     "SWIFT_FEATURE_ADD_TARGET_NAME_TO_OUTPUT",
     "SWIFT_FEATURE_COMPILE_IN_PARALLEL",
     "SWIFT_FEATURE_DECLARE_SWIFTSOURCEINFO",
@@ -57,14 +54,17 @@ load(
     "SWIFT_FEATURE_MODULAR_INDEXING",
     "SWIFT_FEATURE_MODULE_MAP_HOME_IS_CWD",
     "SWIFT_FEATURE_NO_GENERATED_MODULE_MAP",
+    "SWIFT_FEATURE_OPT",
     "SWIFT_FEATURE_OPT_USES_CMO",
     "SWIFT_FEATURE_OPT_USES_WMO",
-    "SWIFT_FEATURE_OPT",
     "SWIFT_FEATURE_PROPAGATE_GENERATED_MODULE_MAP",
     "SWIFT_FEATURE_SYSTEM_MODULE",
     "SWIFT_FEATURE_THIN_LTO",
     "SWIFT_FEATURE_USE_EXPLICIT_SWIFT_MODULE_MAP",
     "SWIFT_FEATURE_VFSOVERLAY",
+    "SWIFT_FEATURE__NUM_THREADS_0_IN_SWIFTCOPTS",
+    "SWIFT_FEATURE__OPT_IN_SWIFTCOPTS",
+    "SWIFT_FEATURE__WMO_IN_SWIFTCOPTS",
 )
 load(
     ":features.bzl",

swift/internal/features.bzl

@@ -22,6 +22,7 @@ load(
     "SWIFT_FEATURE_CHECKED_EXCLUSIVITY",
     "SWIFT_FEATURE_COVERAGE",
     "SWIFT_FEATURE_COVERAGE_PREFIX_MAP",
+    "SWIFT_FEATURE_DEBUG_PREFIX_MAP",
     "SWIFT_FEATURE_DISABLE_CLANG_SPI",
     "SWIFT_FEATURE_DISABLE_SYSTEM_INDEX",
     "SWIFT_FEATURE_EMIT_SWIFTDOC",
@@ -273,6 +274,7 @@ def default_features_for_toolchain(target_triple):
         SWIFT_FEATURE_CACHEABLE_SWIFTMODULES,
         SWIFT_FEATURE_CHECKED_EXCLUSIVITY,
         SWIFT_FEATURE_COVERAGE_PREFIX_MAP,
+        SWIFT_FEATURE_DEBUG_PREFIX_MAP,
         SWIFT_FEATURE_DISABLE_CLANG_SPI,
         SWIFT_FEATURE_DISABLE_SYSTEM_INDEX,
         SWIFT_FEATURE_EMIT_SWIFTDOC,

swift/toolchains/BUILD

@@ -14,10 +14,10 @@ bzl_library(
         "//swift/internal:debugging",
         "//swift/internal:feature_names",
         "//swift/internal:features",
+        "//swift/internal:optimization",
         "//swift/internal:providers",
         "//swift/internal:target_triples",
         "//swift/internal:utils",
-        "//swift/internal:wmo",
         "//swift/toolchains/config:action_config",
         "//swift/toolchains/config:all_actions_config",
         "//swift/toolchains/config:compile_config",
@@ -42,10 +42,10 @@ bzl_library(
         "//swift/internal:attrs",
         "//swift/internal:feature_names",
         "//swift/internal:features",
+        "//swift/internal:optimization",
         "//swift/internal:providers",
         "//swift/internal:target_triples",
         "//swift/internal:utils",
-        "//swift/internal:wmo",
         "//swift/toolchains/config:action_config",
         "//swift/toolchains/config:all_actions_config",
         "//swift/toolchains/config:compile_config",

swift/toolchains/config/compile_config.bzl

@@ -593,9 +593,7 @@ def compile_action_configs(
     action_configs.append(
         # Support for order-file instrumentation.
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [
                 add_arg("-sanitize=undefined"),
                 add_arg("-sanitize-coverage=func"),
@@ -852,9 +850,7 @@ def compile_action_configs(
             features = [SWIFT_FEATURE_VFSOVERLAY],
         ),
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [_module_aliases_configurator],
         ),
         ActionConfigInfo(
@@ -1194,9 +1190,7 @@ def compile_action_configs(
             ],
         ),
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [
                 add_arg("-cxx-interoperability-mode=default"),
                 add_arg("-Xcc", "-std=c++17"),
@@ -1206,9 +1200,7 @@ def compile_action_configs(
             ],
         ),
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [
                 add_arg("-cxx-interoperability-mode=default"),
                 add_arg("-Xcc", "-std=c++20"),
@@ -1218,9 +1210,7 @@ def compile_action_configs(
             ],
         ),
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [
                 add_arg("-cxx-interoperability-mode=default"),
                 add_arg("-Xcc", "-std=c++23"),
@@ -1230,9 +1220,7 @@ def compile_action_configs(
             ],
         ),
         ActionConfigInfo(
-            actions = [
-                SWIFT_ACTION_COMPILE,
-            ],
+            actions = all_compile_action_names(),
             configurators = [
                 add_arg("-enable-experimental-feature", "Embedded"),
             ],
@@ -1262,7 +1250,7 @@ def compile_action_configs(
             ActionConfigInfo(
                 actions = all_compile_action_names() + [
                     SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
-                        SWIFT_ACTION_DUMP_AST,
+                    SWIFT_ACTION_DUMP_AST,
                     SWIFT_ACTION_PRECOMPILE_C_MODULE,
                     SWIFT_ACTION_SYMBOL_GRAPH_EXTRACT,
                     SWIFT_ACTION_SYNTHESIZE_INTERFACE,
@@ -1283,7 +1271,7 @@ def compile_action_configs(
                 # actions, or if we should advise against/forbid that.
                 actions = all_compile_action_names() + [
                     SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
-                        SWIFT_ACTION_DUMP_AST,
+                    SWIFT_ACTION_DUMP_AST,
                 ],
                 configurators = [
                     lambda _, args: args.add_all(
@@ -1313,17 +1301,15 @@ def compile_action_configs(
         ),
     )
 
-    action_configs.extend(
-        [
-            ActionConfigInfo(
-                actions = all_compile_action_names() + [
-                    SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
-                    SWIFT_ACTION_DUMP_AST,
-                    SWIFT_ACTION_PRECOMPILE_C_MODULE,
-                ],
-                configurators = [_source_files_configurator],
-            ),
-        ],
+    action_configs.append(
+        ActionConfigInfo(
+            actions = all_compile_action_names() + [
+                SWIFT_ACTION_COMPILE_MODULE_INTERFACE,
+                SWIFT_ACTION_DUMP_AST,
+                SWIFT_ACTION_PRECOMPILE_C_MODULE,
+            ],
+            configurators = [_source_files_configurator],
+        ),
     )
 
     # Add additional input files to the sandbox (does not modify flags).

swift/toolchains/swift_toolchain.bzl

@@ -459,9 +459,13 @@ def _swift_toolchain_impl(ctx):
 
     # Combine build mode features, autoconfigured features, and required
     # features.
-    features_from_swiftcopts, _ = optimization_features_from_swiftcopts(swiftcopts = swiftcopts)
+    requested_build_mode_features, _ = features_for_build_modes(ctx)
+    requested_optimization_features, _ = optimization_features_from_swiftcopts(
+        swiftcopts = swiftcopts,
+    )
     requested_features = (
-        features_for_build_modes(ctx) + features_from_swiftcopts
+        requested_build_mode_features +
+        requested_optimization_features
     )
     requested_features.extend(default_features_for_toolchain(
         target_triple = target_triple,
@@ -668,7 +672,8 @@ to the compiler for exec transition builds.
                 allow_files = True,
                 default = Label("//tools/worker"),
                 doc = """\
-An executable that wraps Swift compiler invocations.
+An executable that wraps Swift compiler invocations and also provides support
+for incremental compilation using a persistent mode.
 """,
                 executable = True,
             ),

test/fixtures/debug_settings/BUILD

@@ -23,9 +23,3 @@ swift_library(
     ],
     tags = FIXTURE_TAGS,
 )
-
-swift_library(
-    name = "simple_batch_mode",
-    srcs = ["Empty.swift"],
-    tags = FIXTURE_TAGS,
-)

tools/common/bazel_substitutions.cc

@@ -29,7 +29,11 @@ namespace {
 
 // Returns the value of the given environment variable, or the empty string if
 // it wasn't set.
-std::string GetEnvironmentVariable(absl::string_view name) {
+std::string GetAppleEnvironmentVariable(absl::string_view name) {
+#if !defined(__APPLE__)
+  return "";
+#endif
+
   std::string null_terminated_name(name.data(), name.length());
   char *env_value = getenv(null_terminated_name.c_str());
   if (env_value == nullptr) {
@@ -39,7 +43,7 @@ std::string GetEnvironmentVariable(absl::string_view name) {
   return env_value;
 }
 
-std::string GetToolchainPath() {
+std::string GetAppleToolchainPath() {
 #if !defined(__APPLE__)
   return "";
 #endif
@@ -86,15 +90,15 @@ BazelPlaceholderSubstitutions::BazelPlaceholderSubstitutions() {
   // the build rules. If the variable isn't set, we don't store a substitution;
   // if it was needed then the eventual replacement will be a no-op and the
   // command will presumably fail later.
-  if (std::string developer_dir = GetEnvironmentVariable("DEVELOPER_DIR");
+  if (std::string developer_dir = GetAppleEnvironmentVariable("DEVELOPER_DIR");
       !developer_dir.empty()) {
     substitutions_[kBazelXcodeDeveloperDir] = developer_dir;
   }
-  if (std::string sdk_root = GetEnvironmentVariable("SDKROOT");
+  if (std::string sdk_root = GetAppleEnvironmentVariable("SDKROOT");
       !sdk_root.empty()) {
     substitutions_[kBazelXcodeSdkRoot] = sdk_root;
   }
-  if (std::string toolchain_path = GetToolchainPath();
+  if (std::string toolchain_path = GetAppleToolchainPath();
       !toolchain_path.empty()) {
     substitutions_[kBazelSwiftToolchainPath] = toolchain_path;
   }