Make Skylark dicts mutable

Represent Skylark dict using a new subclass SkylarkDict<K, V> of Map<K, V>.
Back it with a TreeMap to provide a deterministic iteration order.
Also make SkylarkList generic in its element type <E>.
Have Artifact implement Comparable<Object> so it can be used as TreeMap key.

--
MOS_MIGRATED_REVID=113277489

1 files changed, 18 insertions, 0 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 55e9cc1bf6..28bd503ed5 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,6 +15,9 @@ 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;
 
@@ -71,6 +74,21 @@ 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 {