More ValidationEnvironment cleanup, remove SkylarkType.GLOBAL.

We don't need to store object methods, just global values.

--
MOS_MIGRATED_REVID=91094780

1 files changed, 2 insertions, 13 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
index 1239ba861f..be2ae1c184 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/MethodLibrary.java
@@ -1167,25 +1167,14 @@ public class MethodLibrary {
     }
   }
 
-  private static void setupValidationEnvironment(
-      Map<Function, SkylarkType> functions, Map<String, SkylarkType> result) {
-    for (Map.Entry<Function, SkylarkType> function : functions.entrySet()) {
-      String name = function.getKey().getName();
-      result.put(name, SkylarkFunctionType.of(name, function.getValue()));
-    }
-  }
-
   /**
    * Collect global functions for the validation environment.
    */
-  public static void setupValidationEnvironment(
-      Map<SkylarkType, Map<String, SkylarkType>> builtIn) {
-    Map<String, SkylarkType> global = builtIn.get(SkylarkType.GLOBAL);
-
+  public static void setupValidationEnvironment(Map<String, SkylarkType> builtIn) {
     // TODO(bazel-team): To be simplified (we need only the names, not the types).
     for (Map.Entry<Function, SkylarkType> function : skylarkGlobalFunctions.entrySet()) {
       String name = function.getKey().getName();
-      global.put(name, SkylarkFunctionType.of(name, function.getValue()));
+      builtIn.put(name, SkylarkFunctionType.of(name, function.getValue()));
     }
   }
 }