Remove the type data from ToolchainInfo, it is reduntant with DeclaredToolchainInfo.

Fixes #3458.

Change-Id: I24dd6d9d24432b9aaf0229de658f07e465ad63cb
PiperOrigin-RevId: 163466882

1 files changed, 11 insertions, 23 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java
index 16e5a857ac..d8d1282ef4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/ToolchainInfo.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.analysis.platform;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
 import com.google.devtools.build.lib.events.Location;
 import com.google.devtools.build.lib.packages.NativeClassObjectConstructor;
@@ -49,13 +48,12 @@ public class ToolchainInfo extends SkylarkClassObject {
           FunctionSignature.of(
               /*numMandatoryPositionals=*/ 0,
               /*numOptionalPositionals=*/ 0,
-              /*numMandatoryNamedOnly*/ 1,
+              /*numMandatoryNamedOnly*/ 0,
               /*starArg=*/ false,
               /*kwArg=*/ true,
-              /*names=*/ "type",
-              "data"),
+              /*names=*/ "data"),
           /*defaultValues=*/ null,
-          /*types=*/ ImmutableList.<SkylarkType>of(SkylarkType.of(Label.class), SkylarkType.DICT));
+          /*types=*/ ImmutableList.<SkylarkType>of(SkylarkType.DICT));
 
   /** Skylark constructor and identifier for this provider. */
   public static final NativeClassObjectConstructor<ToolchainInfo> SKYLARK_CONSTRUCTOR =
@@ -64,34 +62,24 @@ public class ToolchainInfo extends SkylarkClassObject {
         @Override
         protected ToolchainInfo createInstanceFromSkylark(Object[] args, Location loc)
             throws EvalException {
-          // Based on SIGNATURE above, the args are label, map.
-          Label type = (Label) args[0];
           Map<String, Object> data =
-              SkylarkDict.castSkylarkDictOrNoneToDict(args[1], String.class, Object.class, "data");
-          return ToolchainInfo.create(type, data, loc);
+              SkylarkDict.castSkylarkDictOrNoneToDict(args[0], String.class, Object.class, "data");
+          return ToolchainInfo.create(data, loc);
         }
       };
 
-  private final Label type;
-
-  private ToolchainInfo(Label type, Map<String, Object> toolchainData, Location loc) {
+  private ToolchainInfo(Map<String, Object> toolchainData, Location loc) {
     super(
         SKYLARK_CONSTRUCTOR,
-        ImmutableMap.<String, Object>builder().put("type", type).putAll(toolchainData).build(),
+        ImmutableMap.<String, Object>builder().putAll(toolchainData).build(),
         loc);
-
-    this.type = type;
-  }
-
-  public Label type() {
-    return type;
   }
 
-  public static ToolchainInfo create(Label type, Map<String, Object> toolchainData) {
-    return create(type, toolchainData, Location.BUILTIN);
+  public static ToolchainInfo create(Map<String, Object> toolchainData) {
+    return create(toolchainData, Location.BUILTIN);
   }
 
-  public static ToolchainInfo create(Label type, Map<String, Object> toolchainData, Location loc) {
-    return new ToolchainInfo(type, toolchainData, loc);
+  public static ToolchainInfo create(Map<String, Object> toolchainData, Location loc) {
+    return new ToolchainInfo(toolchainData, loc);
   }
 }