Unify all the disassociated references to the "unstripped" binary outputs and the anticipated base name via use of "fragment_support" and "outputs", shared through compilation_support and linking_support. This will be used to reference the unstripped binary that is found in the generated dSYM bundles.

Cherry-pick: c19c91b

Author: nglevin

apple/internal/BUILD

@@ -202,6 +202,8 @@ bzl_library(
         "//apple:__subpackages__",
     ],
     deps = [
+        ":fragment_support",
+        ":outputs",
         ":platform_support",
         "@bazel_skylib//lib:paths",
     ],
@@ -260,6 +262,14 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "fragment_support",
+    srcs = ["fragment_support.bzl"],
+    visibility = [
+        "//apple:__subpackages__",
+    ],
+)
+
 bzl_library(
     name = "framework_import_support",
     srcs = ["framework_import_support.bzl"],
@@ -345,6 +355,7 @@ bzl_library(
         ":compilation_support",
         ":entitlements_support",
         ":intermediates",
+        ":outputs",
         ":providers",
         ":rule_support",
         "@bazel_skylib//lib:collections",
@@ -431,6 +442,7 @@ bzl_library(
     ],
     deps = [
         ":experimental",
+        ":fragment_support",
         ":intermediates",
         "@bazel_skylib//lib:paths",
     ],

apple/internal/compilation_support.bzl

@@ -14,14 +14,18 @@
 
 """Utility methods used for creating objc_* rules actions"""
 
-load(
-    "@bazel_skylib//lib:paths.bzl",
-    "paths",
-)
 load(
     "@rules_cc//cc/common:cc_common.bzl",
     "cc_common",
 )
+load(
+    "//apple/internal:fragment_support.bzl",
+    "fragment_support",
+)
+load(
+    "//apple/internal:outputs.bzl",
+    "outputs",
+)
 load(
     "//apple/internal:platform_support.bzl",
     "platform_support",
@@ -132,10 +136,12 @@ def _register_binary_strip_action(
         "-bundle" in extra_link_args or link_bundle or "-kext" in extra_link_args):
         strip_safe = True
 
-    # TODO(b/331163513): Use intermediates.file() instead of declare_shareable_artifact().
-    stripped_binary = ctx.actions.declare_shareable_artifact(
-        paths.join(ctx.label.package, name),
-        apple_platform_info.target_build_config.bin_dir,
+    stripped_binary = outputs.main_binary(
+        actions = ctx.actions,
+        apple_platform_info = apple_platform_info,
+        cpp_fragment = ctx.fragments.cpp,
+        label = ctx.label,
+        unstripped = False,
     )
     args = ctx.actions.args()
     args.add("strip")
@@ -160,13 +166,6 @@ def _register_binary_strip_action(
     )
     return stripped_binary
 
-def _emit_builtin_objc_strip_action(ctx):
-    return (
-        ctx.fragments.objc.builtin_objc_strip_action and
-        ctx.fragments.cpp.objc_enable_binary_stripping() and
-        ctx.fragments.cpp.compilation_mode() == "opt"
-    )
-
 def _register_configuration_specific_link_actions(
         *,
         additional_outputs,
@@ -191,23 +190,13 @@ def _register_configuration_specific_link_actions(
     ctx = common_variables.ctx
     feature_configuration = _build_feature_configuration(common_variables)
 
-    # When compilation_mode=opt and objc_enable_binary_stripping are specified, the unstripped
-    # binary containing debug symbols is generated by the linker, which also needs the debug
-    # symbols for dead-code removal. The binary is also used to generate dSYM bundle if
-    # --apple_generate_dsym is specified. A symbol strip action is later registered to strip
-    # the symbol table from the unstripped binary.
-    if _emit_builtin_objc_strip_action(ctx):
-        # TODO(b/331163513): Use intermediates.file() instead of declare_shareable_artifact().
-        binary = ctx.actions.declare_shareable_artifact(
-            paths.join(ctx.label.package, name + "_unstripped"),
-            apple_platform_info.target_build_config.bin_dir,
-        )
-    else:
-        # TODO(b/331163513): Use intermediates.file() instead of declare_shareable_artifact().
-        binary = ctx.actions.declare_shareable_artifact(
-            paths.join(ctx.label.package, name),
-            apple_platform_info.target_build_config.bin_dir,
-        )
+    binary = outputs.main_binary(
+        actions = ctx.actions,
+        apple_platform_info = apple_platform_info,
+        cpp_fragment = ctx.fragments.cpp,
+        label = ctx.label,
+        unstripped = ctx.fragments.objc.builtin_objc_strip_action,
+    )
 
     prefixed_attr_linkopts = [
         "-Wl,%s" % linkopt
@@ -245,7 +234,9 @@ def _register_configuration_specific_link_actions(
         variables_extension = user_variable_extensions,
     )
 
-    if _emit_builtin_objc_strip_action(ctx):
+    if fragment_support.is_objc_strip_action_enabled(
+        cpp_fragment = ctx.fragments.cpp,
+    ) and ctx.fragments.objc.builtin_objc_strip_action:
         return _register_binary_strip_action(
             ctx = ctx,
             apple_platform_info = apple_platform_info,

apple/internal/fragment_support.bzl

@@ -0,0 +1,31 @@
+# Copyright 2025 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Wrapper to centralize configuration of fragment-based logic."""
+
+visibility([
+    "//apple/...",
+    "//test/...",
+])
+
+def _is_objc_strip_action_enabled(*, cpp_fragment):
+    """Returns wheither the Objective-C strip action is active."""
+    return (
+        cpp_fragment.objc_enable_binary_stripping() and
+        cpp_fragment.compilation_mode() == "opt"
+    )
+
+fragment_support = struct(
+    is_objc_strip_action_enabled = _is_objc_strip_action_enabled,
+)

apple/internal/linking_support.bzl

@@ -14,10 +14,6 @@
 
 """Support for linking related actions."""
 
-load(
-    "@bazel_skylib//lib:paths.bzl",
-    "paths",
-)
 load("@build_bazel_apple_support//lib:lipo.bzl", "lipo")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
@@ -41,6 +37,10 @@ load(
     "//apple/internal:multi_arch_binary_support.bzl",
     "subtract_linking_contexts",
 )
+load(
+    "//apple/internal:outputs.bzl",
+    "outputs",
+)
 load(
     "//apple/internal:providers.bzl",
     "AppleDynamicFrameworkInfo",
@@ -234,7 +234,7 @@ def _link_multi_arch_binary(
     avoid_cc_infos.extend([dep[CcInfo] for dep in avoid_deps if CcInfo in dep])
     avoid_cc_linking_contexts = [dep.linking_context for dep in avoid_cc_infos]
 
-    outputs = []
+    linker_outputs = []
     cc_infos = []
     legacy_debug_outputs = {}
 
@@ -300,15 +300,16 @@ Please report this as a bug to the Apple BUILD Rules team.
                     dsym_variants = dsym_variants,
                 ))
             else:
-                if ctx.fragments.cpp.objc_should_strip_binary:
-                    suffix = "_bin_unstripped"
-                else:
-                    suffix = "_bin"
+                main_binary_unstripped_basename = outputs.main_binary_basename(
+                    cpp_fragment = ctx.fragments.cpp,
+                    label_name = ctx.label.name,
+                    unstripped = True,
+                )
                 dsym_output = intermediates.file(
                     actions = ctx.actions,
                     target_name = ctx.label.name,
                     output_discriminator = split_transition_key,
-                    file_name = "{}.dwarf".format(ctx.label.name + suffix),
+                    file_name = "{}.dwarf".format(main_binary_unstripped_basename),
                 )
 
                 # TODO(b/391401130): Remove this once all users are migrated to the downstream
@@ -333,7 +334,12 @@ Please report this as a bug to the Apple BUILD Rules team.
             additional_outputs.append(linkmap)
             legacy_debug_outputs.setdefault(platform_info.target_arch, {})["linkmap"] = linkmap
 
-        name = ctx.label.name + "_bin"
+        main_binary_basename = outputs.main_binary_basename(
+            cpp_fragment = ctx.fragments.cpp,
+            label_name = ctx.label.name,
+            unstripped = False,
+        )
+
         executable = compilation_support.register_configuration_specific_link_actions(
             additional_outputs = additional_outputs,
             apple_platform_info = platform_info,
@@ -342,7 +348,7 @@ Please report this as a bug to the Apple BUILD Rules team.
             cc_linking_context = cc_linking_context,
             extra_link_args = extra_linkopts,
             extra_link_inputs = extra_link_inputs,
-            name = name,
+            name = main_binary_basename,
             stamp = stamp,
             user_variable_extensions = variables_extension | extensions,
         )
@@ -356,7 +362,7 @@ Please report this as a bug to the Apple BUILD Rules team.
             "linkmap": linkmap,
         }
 
-        outputs.append(struct(**output))
+        linker_outputs.append(struct(**output))
 
     header_tokens = []
     for _, deps in split_deps.items():
@@ -369,7 +375,7 @@ Please report this as a bug to the Apple BUILD Rules team.
     return struct(
         cc_info = cc_common.merge_cc_infos(direct_cc_infos = cc_infos),
         output_groups = output_groups,
-        outputs = outputs,
+        outputs = linker_outputs,
         debug_outputs_provider = new_appledebugoutputsinfo(outputs_map = legacy_debug_outputs),
     )
 

apple/internal/outputs.bzl

@@ -26,6 +26,10 @@ load(
     "//apple/internal:experimental.bzl",
     "is_experimental_tree_artifact_enabled",
 )
+load(
+    "//apple/internal:fragment_support.bzl",
+    "fragment_support",
+)
 load(
     "//apple/internal:intermediates.bzl",
     "intermediates",
@@ -122,6 +126,47 @@ def _infoplist(*, actions, label_name, output_discriminator):
         file_name = "Info.plist",
     )
 
+def _main_binary(
+        *,
+        actions,
+        apple_platform_info,
+        cpp_fragment,
+        label,
+        unstripped):
+    """Returns a file reference for the main binary that gets linked."""
+
+    # TODO(b/331163513): Use intermediates.file() instead of declare_shareable_artifact() as soon as
+    # it is safe to do so.
+    return actions.declare_shareable_artifact(
+        paths.join(label.package, _main_binary_basename(
+            cpp_fragment = cpp_fragment,
+            label_name = label.name,
+            unstripped = unstripped,
+        )),
+        apple_platform_info.target_build_config.bin_dir,
+    )
+
+def _main_binary_basename(
+        *,
+        cpp_fragment,
+        label_name,
+        unstripped):
+    """Returns the basename of the main binary that gets linked."""
+
+    # When compilation_mode=opt and objc_enable_binary_stripping are specified, the unstripped
+    # binary containing debug symbols is generated by the linker, which also needs the debug
+    # symbols for dead-code removal. The binary is also used to generate dSYM bundle if
+    # --apple_generate_dsym is specified. A symbol strip action is later registered to strip
+    # the symbol table from the unstripped binary.
+    if fragment_support.is_objc_strip_action_enabled(
+        cpp_fragment = cpp_fragment,
+    ) and unstripped:
+        suffix = "_bin_unstripped"
+    else:
+        suffix = "_bin"
+
+    return label_name + suffix
+
 def _has_different_embedding_archive(*, platform_prerequisites, rule_descriptor):
     """Returns True if this target exposes a different archive when embedded in another target."""
     tree_artifact_enabled = is_experimental_tree_artifact_enabled(
@@ -188,6 +233,8 @@ outputs = struct(
     dsyms = _dsyms,
     executable = _executable,
     infoplist = _infoplist,
+    main_binary = _main_binary,
+    main_binary_basename = _main_binary_basename,
     merge_output_groups = _merge_output_groups,
     root_path_from_archive = _root_path_from_archive,
     has_different_embedding_archive = _has_different_embedding_archive,