Delete the flag incompatible_bzl_disallow_load_after_statement

bazelbuild/bazel#5815 RELNOTES: The flag `incompatible_bzl_disallow_load_after_statement` is removed. PiperOrigin-RevId: 302473246
luca-digrazia · Sep 4, 2022 · 38e91d0 · 38e91d0
1 parent 6b54458
commit 38e91d0
Show file tree

Hide file tree

Showing 5 changed files with 673 additions and 393 deletions.
diff --git a/....bazel/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/....bazel/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -482,6 +482,20 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
               + "2019-10-24-file-visibility.md")
   public boolean incompatibleNoImplicitFileExport;
 
+  @Option(
+      name = "incompatible_no_output_attr_default",
+      defaultValue = "true",
+      documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
+      effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
+      metadataTags = {
+        OptionMetadataTag.INCOMPATIBLE_CHANGE,
+        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
+      },
+      help =
+          "If set to true, disables the `default` parameter of the `attr.output` and "
+              + "`attr.output_list` attribute definition functions.")
+  public boolean incompatibleNoOutputAttrDefault;
+
   @Option(
       name = "incompatible_no_rule_outputs_param",
       defaultValue = "false",
@@ -690,6 +704,7 @@ public StarlarkSemantics toSkylarkSemantics() {
             .incompatibleNewActionsApi(incompatibleNewActionsApi)
             .incompatibleNoAttrLicense(incompatibleNoAttrLicense)
             .incompatibleNoImplicitFileExport(incompatibleNoImplicitFileExport)
+            .incompatibleNoOutputAttrDefault(incompatibleNoOutputAttrDefault)
             .incompatibleNoRuleOutputsParam(incompatibleNoRuleOutputsParam)
             .incompatibleNoSupportToolsInActionInputs(incompatibleNoSupportToolsInActionInputs)
             .incompatibleNoTargetOutputGroup(incompatibleNoTargetOutputGroup)

diff --git a/...azelbuild.bazel/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/...azelbuild.bazel/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -74,6 +74,8 @@ private FlagIdentifier() {} // uninstantiable
         "incompatible_applicable_licenses";
     public static final String INCOMPATIBLE_DISABLE_DEPSET_INPUTS =
         "incompatible_disable_depset_inputs";
+    public static final String INCOMPATIBLE_NO_OUTPUT_ATTR_DEFAULT =
+        "incompatible_no_output_attr_default";
     public static final String INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM =
         "incompatible_no_rule_outputs_param";
     public static final String INCOMPATIBLE_NO_TARGET_OUTPUT_GROUP =
@@ -125,6 +127,8 @@ public boolean flagValue(String flag) {
         return incompatibleApplicableLicenses();
       case FlagIdentifier.INCOMPATIBLE_DISABLE_DEPSET_INPUTS:
         return incompatibleDisableDepsetItems();
+      case FlagIdentifier.INCOMPATIBLE_NO_OUTPUT_ATTR_DEFAULT:
+        return incompatibleNoOutputAttrDefault();
       case FlagIdentifier.INCOMPATIBLE_NO_RULE_OUTPUTS_PARAM:
         return incompatibleNoRuleOutputsParam();
       case FlagIdentifier.INCOMPATIBLE_NO_TARGET_OUTPUT_GROUP:
@@ -236,6 +240,8 @@ boolean isFeatureEnabledBasedOnTogglingFlags(String enablingFlag, String disabli
 
   public abstract boolean incompatibleNoImplicitFileExport();
 
+  public abstract boolean incompatibleNoOutputAttrDefault();
+
   public abstract boolean incompatibleNoRuleOutputsParam();
 
   public abstract boolean incompatibleNoSupportToolsInActionInputs();
@@ -330,6 +336,7 @@ public static Builder builderWithDefaults() {
           .incompatibleNewActionsApi(true)
           .incompatibleNoAttrLicense(true)
           .incompatibleNoImplicitFileExport(false)
+          .incompatibleNoOutputAttrDefault(true)
           .incompatibleNoRuleOutputsParam(false)
           .incompatibleNoSupportToolsInActionInputs(true)
           .incompatibleNoTargetOutputGroup(true)
@@ -410,6 +417,8 @@ public abstract static class Builder {
 
     public abstract Builder incompatibleNoImplicitFileExport(boolean value);
 
+    public abstract Builder incompatibleNoOutputAttrDefault(boolean value);
+
     public abstract Builder incompatibleNoRuleOutputsParam(boolean value);
 
     public abstract Builder incompatibleNoSupportToolsInActionInputs(boolean value);