commit ba23ae2a4ae20d14f98475a482715821e2d0dd61
author brandjon <brandjon@google.com> Tue Jan 16 08:21:37 2018 -0800
committer Copybara-Service <copybara-piper@google.com> Tue Jan 16 08:23:08 2018 -0800
tree 622579156962084bd90bd7ababa5fa7f60708223
parent 32d8dc9caba84136340e0354656c9d2bd790b21f

Fix value collision in builtins registry

If two values compared equal (e.g., MethodLibrary#bool and SkylarkAttr#bool), we were dropping one of them in favor of the other.

RELNOTES: None
PiperOrigin-RevId: 182057611

src/main/java/com/google/devtools/build/lib/syntax/Runtime.java

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
index 839b311..3decbeb 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Runtime.java
@@ -15,6 +15,7 @@
 package com.google.devtools.build.lib.syntax;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
@@ -203,9 +204,9 @@
       functions.get(namespace).put(function.getName(), function);
     }
 
-    /** Returns a set of all registered builtins, in a deterministic order. */
-    public ImmutableSet<Object> getBuiltins() {
-      return ImmutableSet.copyOf(allBuiltins.values());
+    /** Returns a list of all registered builtins, in a deterministic order. */
+    public ImmutableList<Object> getBuiltins() {
+      return ImmutableList.copyOf(allBuiltins.values());
     }
 
     @Nullable