Rollback of commit f941d56acfad5f8c819c81b494f806ea74ea7fd8.

*** Reason for rollback ***

Breaks many targets, see []

*** Original change description ***

Reinstate mutable SkylarkDict

Add <String, Object> annotation to optionMap invocation in SkylarkAttr,
to make JDK 1.7 happy.

Give the visible name "aspect" to class SkylarkAspect.

--
MOS_MIGRATED_REVID=113543873

1 files changed, 0 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/compiler/ByteCodeMethodCalls.java b/src/main/java/com/google/devtools/build/lib/syntax/compiler/ByteCodeMethodCalls.java
index 28bd503ed5..55e9cc1bf6 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/compiler/ByteCodeMethodCalls.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/compiler/ByteCodeMethodCalls.java
@@ -15,9 +15,6 @@ package com.google.devtools.build.lib.syntax.compiler;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.events.Location;
-import com.google.devtools.build.lib.syntax.Environment;
-import com.google.devtools.build.lib.syntax.SkylarkDict;
 
 import net.bytebuddy.implementation.bytecode.StackManipulation;
 
@@ -74,21 +71,6 @@ public class ByteCodeMethodCalls {
   }
 
   /**
-   * Byte code invocations for {@link SkylarkDict}.
-   */
-  public static class BCSkylarkDict {
-    public static final StackManipulation of =
-        ByteCodeUtils.invoke(SkylarkDict.class, "of", Environment.class);
-
-    public static final StackManipulation copyOf =
-        ByteCodeUtils.invoke(SkylarkDict.class, "copyOf", Environment.class, Map.class);
-
-    public static final StackManipulation put =
-        ByteCodeUtils.invoke(SkylarkDict.class, "put",
-            Object.class, Object.class, Location.class, Environment.class);
-  }
-
-  /**
    * Byte code invocations for {@link ImmutableList}.
    */
   public static class BCImmutableList {