Remove ToolchainContextException and make exception handling more robust.

Change-Id: Iefeab0de85541b963c6cc262339e73b79f630f8b
PiperOrigin-RevId: 203952823

1 files changed, 4 insertions, 12 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
index 630542b5af..737bbd8982 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ToolchainResolutionFunction.java
@@ -28,8 +28,7 @@ import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.packages.NoSuchThingException;
 import com.google.devtools.build.lib.skyframe.RegisteredToolchainsFunction.InvalidToolchainLabelException;
-import com.google.devtools.build.lib.skyframe.ToolchainUtil.ToolchainContextException;
-import com.google.devtools.build.lib.syntax.EvalException;
+import com.google.devtools.build.lib.skyframe.ToolchainUtil.InvalidPlatformException;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
@@ -64,15 +63,12 @@ public class ToolchainResolutionFunction implements SkyFunction {
           (RegisteredToolchainsValue)
               env.getValueOrThrow(
                   RegisteredToolchainsValue.key(key.configurationKey()),
-                  InvalidToolchainLabelException.class,
-                  EvalException.class);
+                  InvalidToolchainLabelException.class);
       if (toolchains == null) {
         return null;
       }
     } catch (InvalidToolchainLabelException e) {
       throw new ToolchainResolutionFunctionException(e);
-    } catch (EvalException e) {
-      throw new ToolchainResolutionFunctionException(e);
     }
 
     // Find the right one.
@@ -125,7 +121,7 @@ public class ToolchainResolutionFunction implements SkyFunction {
       if (platforms == null) {
         return null;
       }
-    } catch (ToolchainContextException e) {
+    } catch (InvalidPlatformException e) {
       throw new ToolchainResolutionFunctionException(e);
     }
 
@@ -255,15 +251,11 @@ public class ToolchainResolutionFunction implements SkyFunction {
       super(e, Transience.PERSISTENT);
     }
 
-    public ToolchainResolutionFunctionException(ToolchainContextException e) {
-      super(e, Transience.PERSISTENT);
-    }
-
     public ToolchainResolutionFunctionException(InvalidToolchainLabelException e) {
       super(e, Transience.PERSISTENT);
     }
 
-    public ToolchainResolutionFunctionException(EvalException e) {
+    public ToolchainResolutionFunctionException(InvalidPlatformException e) {
       super(e, Transience.PERSISTENT);
     }
   }