Make the --incompatible_disallow_symlink_file_to_dir flag a no-op in preparation for removal.

PiperOrigin-RevId: 539592265
Change-Id: Ib542d5e86660a8959b1c2a521a9bcf217b74d770

Author: tjgq

src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java

@@ -15,7 +15,6 @@
 
 import static com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext.checkPrivateAccess;
 import static com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions.EXPERIMENTAL_SIBLING_REPOSITORY_LAYOUT;
-import static com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions.INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
@@ -307,11 +306,7 @@ public void symlink(
                 + "declare_directory() instead of declare_symlink()?)");
       }
 
-      boolean inputOutputMismatch =
-          getSemantics().getBool(INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR)
-              ? inputArtifact.isDirectory() != outputArtifact.isDirectory()
-              : !inputArtifact.isDirectory() && outputArtifact.isDirectory();
-      if (inputOutputMismatch) {
+      if (inputArtifact.isDirectory() != outputArtifact.isDirectory()) {
         String inputType = inputArtifact.isDirectory() ? "directory" : "file";
         String outputType = outputArtifact.isDirectory() ? "directory" : "file";
         throw Starlark.errorf(

src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java

@@ -91,8 +91,7 @@ public final class BuildLanguageOptions extends OptionsBase {
       documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
       effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
       metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-      help =
-          "If set to true, `ctx.actions.symlink` will disallow symlinking a file into a directory.")
+      help = "No-op.")
   public boolean incompatibleDisallowSymlinkFileToDir;
 
   @Option(
@@ -676,8 +675,6 @@ public StarlarkSemantics toStarlarkSemantics() {
                 INCOMPATIBLE_STOP_EXPORTING_LANGUAGE_MODULES,
                 incompatibleStopExportingLanguageModules)
             .setBool(INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER, incompatibleRemoveRuleNameParameter)
-            .setBool(
-                INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR, incompatibleDisallowSymlinkFileToDir)
             .setBool(EXPERIMENTAL_ALLOW_TAGS_PROPAGATION, experimentalAllowTagsPropagation)
             .set(EXPERIMENTAL_BUILTINS_BZL_PATH, experimentalBuiltinsBzlPath)
             .setBool(EXPERIMENTAL_BUILTINS_DUMMY, experimentalBuiltinsDummy)
@@ -768,8 +765,6 @@ public StarlarkSemantics toStarlarkSemantics() {
       "-incompatible_stop_exporting_language_modules";
   public static final String INCOMPATIBLE_REMOVE_RULE_NAME_PARAMETER =
       "+incompatible_remove_rule_name_parameter";
-  public static final String INCOMPATIBLE_DISALLOW_SYMLINK_FILE_TO_DIR =
-      "+incompatible_disallow_symlink_file_to_dir";
   public static final String EXPERIMENTAL_ALLOW_TAGS_PROPAGATION =
       "-experimental_allow_tags_propagation";
   public static final String EXPERIMENTAL_BUILTINS_DUMMY = "-experimental_builtins_dummy";

src/test/shell/bazel/bazel_symlink_test.sh

@@ -507,13 +507,6 @@ EOF
 
   bazel build //a:a >& $TEST_log && fail "build succeeded"
   expect_log "symlink() with \"target_file\" directory param requires that \"output\" be declared as a directory"
-
-  bazel build --noincompatible_disallow_symlink_file_to_dir //a:a || fail "build failed"
-  assert_contains "Hello, World!" bazel-bin/a/a.link/inside.txt
-  expect_symlink bazel-bin/a/a.link
-
-  bazel build --incompatible_disallow_symlink_file_to_dir //a:a >& $TEST_log && fail "build succeeded"
-  expect_log "symlink() with \"target_file\" directory param requires that \"output\" be declared as a directory"
 }
 
 function test_symlink_directory_to_file_created_from_symlink_action() {