Enable --incompatible_bzl_disallow_load_after_statement by default
Fixes https://github.com/bazelbuild/bazel/issues/5815
Tested: https://buildkite.com/bazel/bazelisk-plus-incompatible-flags/builds/49
RELNOTES: --incompatible_bzl_disallow_load_after_statement is enabled
PiperOrigin-RevId: 239854652
diff --git a/site/docs/skylark/backward-compatibility.md b/site/docs/skylark/backward-compatibility.md
index 4a71470..f157061 100644
--- a/site/docs/skylark/backward-compatibility.md
+++ b/site/docs/skylark/backward-compatibility.md
@@ -81,7 +81,7 @@
appear at the beginning of the file, i.e. before any other non-`load` statement.
* Flag: `--incompatible_bzl_disallow_load_after_statement`
-* Default: `false`
+* Default: `true`
* Tracking issue: [#5815](https://github.com/bazelbuild/bazel/issues/5815)
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
index f8e6a94..88b137b 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkSemanticsOptions.java
@@ -154,7 +154,7 @@
@Option(
name = "incompatible_bzl_disallow_load_after_statement",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS,
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
metadataTags = {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
index 7485233..54c36e1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/StarlarkSemantics.java
@@ -212,7 +212,7 @@
.experimentalRestrictNamedParams(false)
.experimentalStarlarkConfigTransitions(false)
.incompatibleUseToolchainProvidersInJavaCommon(false)
- .incompatibleBzlDisallowLoadAfterStatement(false)
+ .incompatibleBzlDisallowLoadAfterStatement(true)
.incompatibleDepsetIsNotIterable(false)
.incompatibleDepsetUnion(false)
.incompatibleDisableThirdPartyLicenseChecking(false)
