Remove `experimental_shadowed_action` flag.
This CL removes the experimental flag guarding `shadowed_action` the newly added parameter to Starlark created actions.
PiperOrigin-RevId: 374138873
diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
index d3b47f4..d244a60 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java
@@ -616,18 +616,6 @@
public int nestedSetDepthLimit;
@Option(
- name = "experimental_shadowed_action",
- defaultValue = "false",
- documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
- effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.EXECUTION},
- metadataTags = {OptionMetadataTag.EXPERIMENTAL},
- help =
- "If set to true, allows passing an action for Starlark created actions to shadow and use"
- + " its environment, inputs and discovered inputs combined with the starlark action's"
- + " environment and inputs during execution.")
- public boolean experimentalShadowedAction;
-
- @Option(
name = "incompatible_top_level_aspects_require_providers",
defaultValue = "false",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
@@ -708,7 +696,6 @@
.setBool(INCOMPATIBLE_LINKOPTS_TO_LINKLIBS, incompatibleLinkoptsToLinklibs)
.set(MAX_COMPUTATION_STEPS, maxComputationSteps)
.set(NESTED_SET_DEPTH_LIMIT, nestedSetDepthLimit)
- .setBool(EXPERIMENTAL_SHADOWED_ACTION, experimentalShadowedAction)
.setBool(
INCOMPATIBLE_TOP_LEVEL_ASPECTS_REQUIRE_PROVIDERS,
incompatibleTopLevelAspectsRequireProviders)
@@ -782,7 +769,6 @@
"-incompatible_use_cc_configure_from_rules";
public static final String INCOMPATIBLE_VISIBILITY_PRIVATE_ATTRIBUTES_AT_DEFINITION =
"-incompatible_visibility_private_attributes_at_definition";
- public static final String EXPERIMENTAL_SHADOWED_ACTION = "-experimental_shadowed_action";
public static final String INCOMPATIBLE_TOP_LEVEL_ASPECTS_REQUIRE_PROVIDERS =
"-incompatible_top_level_aspects_require_providers";
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
index 9d74df8..afa6e99 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkActionFactoryApi.java
@@ -430,10 +430,8 @@
defaultValue = "None",
named = true,
positional = false,
- enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_SHADOWED_ACTION,
- valueWhenDisabled = "None",
doc =
- "(Experimental) runs the action using the given shadowed action's inputs and"
+ "Runs the action using the given shadowed action's inputs and"
+ " environment added to the action's inputs list and environment. The action"
+ " environment can overwrite any of the shadowed action's environment"
+ " variables. If none, uses only the action's inputs and given environment."),
@@ -636,10 +634,8 @@
defaultValue = "None",
named = true,
positional = false,
- enableOnlyWithFlag = BuildLanguageOptions.EXPERIMENTAL_SHADOWED_ACTION,
- valueWhenDisabled = "None",
doc =
- "(Experimental) runs the action using the given shadowed action's discovered inputs"
+ "Runs the action using the given shadowed action's discovered inputs"
+ " added to the action's inputs list. If none, uses only the action's"
+ " inputs."),
})
diff --git a/src/test/shell/bazel/cc_integration_test.sh b/src/test/shell/bazel/cc_integration_test.sh
index 06b5315..bf95011 100755
--- a/src/test/shell/bazel/cc_integration_test.sh
+++ b/src/test/shell/bazel/cc_integration_test.sh
@@ -1369,18 +1369,15 @@
# Test that actions are reconstructible under default configuration
bazel build "${package}:a" \
--aspects="//${package}:lib.bzl%actions_test_aspect" \
- --output_groups=out \
- --experimental_shadowed_action || \
- fail "bazel build should've passed"
+ --output_groups=out || \
+ fail "bazel build should've succeeded"
# Test that compile actions are reconstructible when using param files
bazel build "${package}:a" \
--features=compiler_param_file \
--aspects="//${package}:lib.bzl%actions_test_aspect" \
- --output_groups=out \
- --experimental_shadowed_action || \
- fail "bazel build should've passed with --features=compiler_param_file"
+ --output_groups=out || \
+ fail "bazel build should've succeeded with --features=compiler_param_file"
}
-
run_suite "cc_integration_test"
diff --git a/src/test/shell/integration/action_aspect_test.sh b/src/test/shell/integration/action_aspect_test.sh
index 9ae90e7..afd4430 100755
--- a/src/test/shell/integration/action_aspect_test.sh
+++ b/src/test/shell/integration/action_aspect_test.sh
@@ -287,8 +287,7 @@
bazel build "${package}:a" \
--aspects="//${package}:lib.bzl%actions_test_aspect" \
- --output_groups=out \
- --experimental_shadowed_action || \
+ --output_groups=out || \
fail "bazel build should've succeeded"
cp "bazel-bin/${package}/run_timestamp" "${package}/run_1_timestamp"
@@ -299,9 +298,8 @@
bazel build "${package}:a" \
--aspects="//${package}:lib.bzl%actions_test_aspect" \
- --output_groups=out \
- --experimental_shadowed_action || \
- fail "bazel build should've passed"
+ --output_groups=out || \
+ fail "bazel build should've succeeded"
cp "bazel-bin/${package}/run_timestamp" "${package}/run_2_timestamp"
@@ -315,9 +313,8 @@
bazel build "${package}:a" \
--aspects="//${package}:lib.bzl%actions_test_aspect" \
- --output_groups=out \
- --experimental_shadowed_action || \
- fail "bazel build should've passed"
+ --output_groups=out || \
+ fail "bazel build should've succeeded"
cp "bazel-bin/${package}/run_timestamp" "${package}/run_3_timestamp"
