A minor refactoring.

--
MOS_MIGRATED_REVID=90981107

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
index 92ae48b2cc..d12c141aef 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkType.java
@@ -778,7 +778,12 @@ public abstract class SkylarkType {
   /** Build a map of the given key, value types from an Iterable of Map.Entry-s */
   public static <KEY_TYPE, VALUE_TYPE> ImmutableMap<KEY_TYPE, VALUE_TYPE> toMap(
       Iterable<Map.Entry<KEY_TYPE, VALUE_TYPE>> obj) {
-    return ImmutableMap.copyOf(obj);
+    ImmutableMap.Builder<KEY_TYPE, VALUE_TYPE> result = ImmutableMap.builder();
+    for (Map.Entry<KEY_TYPE, VALUE_TYPE> entry : obj) {
+      result.put(entry);
+    }
+
+    return result.build();
   }
 
   /**