PostMark: Respect stamp = -1.

PiperOrigin-RevId: 855716841
Change-Id: I7e94b85443bf262e85f1765493bb1f006bdc5316

Author: bigelephant29

cc/common/cc_helper.bzl

@@ -28,6 +28,7 @@ load(
     _is_stamping_enabled = "is_stamping_enabled",
     _package_source_root = "package_source_root",
     _repository_exec_path = "repository_exec_path",
+    _should_stamp = "should_stamp",
 )
 load(":cc_info.bzl", "CcInfo")
 load(":visibility.bzl", "INTERNAL_VISIBILITY")
@@ -1132,6 +1133,7 @@ cc_helper = struct(
     get_local_defines_for_runfiles_lookup = _get_local_defines_for_runfiles_lookup,
     linker_scripts = _linker_scripts,
     is_stamping_enabled = _is_stamping_enabled,
+    should_stamp = _should_stamp,
     is_test_target = _is_test_target,
     get_linked_artifact = _get_linked_artifact,
     should_create_per_object_debug_info = should_create_per_object_debug_info,

cc/common/cc_helper_internal.bzl

@@ -283,7 +283,7 @@ def repository_exec_path(repository, sibling_repository_layout):
     return get_relative_path(prefix, repository)
 
 def is_stamping_enabled(ctx):
-    """Returns whether to encode build information into the binary.
+    """Returns the tri-state of whether to encode build information into the binary.
 
     Args:
         ctx: The rule context.
@@ -303,6 +303,22 @@ def is_stamping_enabled(ctx):
         stamp = ctx.attr.stamp
     return stamp
 
+def should_stamp(ctx):
+    """Returns whether stamping should actually be performed based on stamp attribute and config.
+
+    Unlike is_stamping_enabled, this takes into account the --[no]stamp Blaze flag, so the return value is a boolean, not a tri-state.
+
+    Args:
+        ctx: The rule context.
+
+    Returns:
+        true if stamping should be performed, false otherwise.
+    """
+    stamping_tri_state = is_stamping_enabled(ctx)
+    return False if ctx.configuration.is_tool_configuration() else (
+        stamping_tri_state == 1 or (stamping_tri_state == -1 and ctx.configuration.stamp_binaries())
+    )
+
 def is_shared_library(file):
     return file.extension in ["so", "dylib", "dll", "pyd", "wasm", "tgt", "vpi"]
 

cc/private/compile/linkstamp_compile.bzl

@@ -20,7 +20,7 @@ Used for C++ linkstamp compiling.
 load("//cc:action_names.bzl", "LINKSTAMP_COMPILE_ACTION_NAME")
 load(
     "//cc/common:cc_helper_internal.bzl",
-    "is_stamping_enabled",
+    "should_stamp",
 )
 load("//cc/common:semantics.bzl", cc_semantics = "semantics")
 load("//cc/private:cc_info.bzl", "EMPTY_COMPILATION_CONTEXT")
@@ -63,10 +63,7 @@ def register_linkstamp_compile_action(
     ctx = _cc_internal.actions2ctx_cheat(actions)
 
     if stamping == None:
-        stamping_tri_state = is_stamping_enabled(ctx)
-        stamping = False if ctx.configuration.is_tool_configuration() else (
-            stamping_tri_state == 1 or (stamping_tri_state == -1 and ctx.configuration.stamp_binaries())
-        )
+        stamping = should_stamp(ctx)
 
     output_group_info = cc_toolchain._build_info_files
     if stamping: