From f9bc66571bf738134dc2796249d08b55f240bb63 Mon Sep 17 00:00:00 2001
From: Jon Brandvein <brandjon@google.com>
Date: Fri, 29 Jul 2016 12:51:38 +0000
Subject: Simplify immutability test

--
MOS_MIGRATED_REVID=128800280
---
 .../java/com/google/devtools/build/lib/syntax/EvalUtils.java | 12 ------------
 .../com/google/devtools/build/lib/syntax/SkylarkList.java    |  5 -----
 2 files changed, 17 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index c462098373..4a661896b6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkValue;
-import com.google.devtools.build.lib.syntax.SkylarkList.Tuple;
 import com.google.devtools.build.lib.syntax.compiler.ByteCodeUtils;
 import com.google.devtools.build.lib.util.Preconditions;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -122,17 +121,6 @@ public final class EvalUtils {
   // NB: This is used as the basis for accepting objects in SkylarkNestedSet-s,
   // as well as for accepting objects as keys for Skylark dict-s.
   public static boolean isImmutable(Object o) {
-    if (o instanceof Tuple) {
-      for (Object item : (Tuple) o) {
-        if (!isImmutable(item)) {
-          return false;
-        }
-      }
-      return true;
-    }
-    if (o instanceof SkylarkMutable) {
-      return false;
-    }
     if (o instanceof SkylarkValue) {
       return ((SkylarkValue) o).isImmutable();
     }
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
index 890d16c46e..debe96856f 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
@@ -396,11 +396,6 @@ public abstract class SkylarkList<E> extends MutableCollection<E> implements Lis
       return false;
     }
 
-    @Override
-    public boolean isImmutable() {
-      return false;
-    }
-
     /**
      * An empty IMMUTABLE MutableList.
      */
-- 
cgit v1.2.3