Remove the flag --incompatible_disallow_dict_lookup_unhashable_keys

The flag was flipped to True in November. #9184 RELNOTES: The flag --incompatible_disallow_dict_lookup_unhashable_keys is removed. PiperOrigin-RevId: 289431363
bazelbuild · Jan 13, 2020 · e8ca0fe · e8ca0fe
1 parent 6a0f07d
commit e8ca0fe
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 42 deletions.
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
@@ -329,20 +329,6 @@ public class StarlarkSemanticsOptions extends OptionsBase implements Serializabl
       help = "If true, disables all license checking logic")
   public boolean incompatibleDisableThirdPartyLicenseChecking;
 
-  @Option(
-      name = "incompatible_disallow_dict_lookup_unhashable_keys",
-      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, dict key lookups using `in` or `dict.get` will fail with unhashable"
-              + " types.")
-  public boolean incompatibleDisallowDictLookupUnhashableKeys;
-
   @Option(
       name = "incompatible_disallow_empty_glob",
       defaultValue = "false",
@@ -679,8 +665,6 @@ public StarlarkSemantics toSkylarkSemantics() {
             .incompatibleUseCcConfigureFromRulesCc(incompatibleUseCcConfigureFromRulesCc)
             .incompatibleDepsetForLibrariesToLinkGetter(incompatibleDepsetForLibrariesToLinkGetter)
             .incompatibleRestrictStringEscapes(incompatibleRestrictStringEscapes)
-            .incompatibleDisallowDictLookupUnhashableKeys(
-                incompatibleDisallowDictLookupUnhashableKeys)
             .build();
     return INTERNER.intern(semantics);
   }

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Dict.java b/src/main/java/com/google/devtools/build/lib/syntax/Dict.java
@@ -523,9 +523,7 @@ public final boolean containsKey(Object key, Location loc) throws EvalException
   @Override
   public final boolean containsKey(Object key, Location loc, StarlarkThread thread)
       throws EvalException {
-    if (thread.getSemantics().incompatibleDisallowDictLookupUnhashableKeys()) {
-      EvalUtils.checkHashable(key);
-    }
+    EvalUtils.checkHashable(key);
     return this.containsKey(key);
   }
 

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
@@ -209,8 +209,6 @@ public boolean flagValue(FlagIdentifier flagIdentifier) {
 
   public abstract boolean incompatibleRestrictStringEscapes();
 
-  public abstract boolean incompatibleDisallowDictLookupUnhashableKeys();
-
   public abstract boolean experimentalAllowTagsPropagation();
 
   public abstract boolean incompatibleUseCcConfigureFromRulesCc();
@@ -288,9 +286,7 @@ public static Builder builderWithDefaults() {
           .incompatibleDoNotSplitLinkingCmdline(true)
           .incompatibleDepsetForLibrariesToLinkGetter(true)
           .incompatibleRestrictStringEscapes(false)
-          .incompatibleDisallowDictLookupUnhashableKeys(false)
           .incompatibleUseCcConfigureFromRulesCc(false)
-          .incompatibleDisallowDictLookupUnhashableKeys(true)
           .build();
 
   /** Builder for {@link StarlarkSemantics}. All fields are mandatory. */
@@ -378,8 +374,6 @@ public abstract static class Builder {
 
     public abstract Builder incompatibleRestrictStringEscapes(boolean value);
 
-    public abstract Builder incompatibleDisallowDictLookupUnhashableKeys(boolean value);
-
     public abstract Builder incompatibleUseCcConfigureFromRulesCc(boolean value);
 
     public abstract StarlarkSemantics build();

diff --git a/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java b/src/test/java/com/google/devtools/build/lib/packages/SkylarkSemanticsConsistencyTest.java
@@ -160,7 +160,6 @@ private static StarlarkSemanticsOptions buildRandomOptions(Random rand) throws E
         "--incompatible_run_shell_command_string=" + rand.nextBoolean(),
         "--incompatible_visibility_private_attributes_at_definition=" + rand.nextBoolean(),
         "--incompatible_restrict_string_escapes=" + rand.nextBoolean(),
-        "--incompatible_disallow_dict_lookup_unhashable_keys=" + rand.nextBoolean(),
         "--incompatible_use_cc_configure_from_rules_cc=" + rand.nextBoolean(),
         "--internal_skylark_flag_test_canary=" + rand.nextBoolean());
   }
@@ -212,7 +211,6 @@ private static StarlarkSemantics buildRandomSemantics(Random rand) {
         .incompatibleRunShellCommandString(rand.nextBoolean())
         .incompatibleVisibilityPrivateAttributesAtDefinition(rand.nextBoolean())
         .incompatibleRestrictStringEscapes(rand.nextBoolean())
-        .incompatibleDisallowDictLookupUnhashableKeys(rand.nextBoolean())
         .incompatibleUseCcConfigureFromRulesCc(rand.nextBoolean())
         .internalSkylarkFlagTestCanary(rand.nextBoolean())
         .build();

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkIntegrationTest.java
@@ -3075,8 +3075,6 @@ public void testRecursiveImport2() throws Exception {
 
   @Test
   public void testUnhashableInDictForbidden() throws Exception {
-    setSkylarkSemanticsOptions("--incompatible_disallow_dict_lookup_unhashable_keys=true");
-
     scratch.file("test/extension.bzl", "y = [] in {}");
 
     scratch.file("test/BUILD", "load('//test:extension.bzl', 'y')", "cc_library(name = 'r')");
@@ -3088,8 +3086,6 @@ public void testUnhashableInDictForbidden() throws Exception {
 
   @Test
   public void testDictGetUnhashableForbidden() throws Exception {
-    setSkylarkSemanticsOptions("--incompatible_disallow_dict_lookup_unhashable_keys=true");
-
     scratch.file("test/extension.bzl", "y = {}.get({})");
 
     scratch.file("test/BUILD", "load('//test:extension.bzl', 'y')", "cc_library(name = 'r')");
@@ -3099,17 +3095,6 @@ public void testDictGetUnhashableForbidden() throws Exception {
     assertContainsEvent("unhashable type: 'dict'");
   }
 
-  @Test
-  public void testUnhashableLookupDict() throws Exception {
-    setSkylarkSemanticsOptions("--incompatible_disallow_dict_lookup_unhashable_keys=false");
-
-    scratch.file("test/extension.bzl", "y = [[] in {}, {}.get({})]");
-
-    scratch.file("test/BUILD", "load('//test:extension.bzl', 'y')", "cc_library(name = 'r')");
-
-    getConfiguredTarget("//test:r");
-  }
-
   @Test
   public void testDisabledPartitionDefaultParameter() throws Exception {
     scratch.file("test/extension.bzl", "y = 'abc'.partition()");