Use a more restricted type bound on SkyFunctionException#validateExceptionType. In practice, this function is only called with subtypes of Exception. Also, this changes emphasizes that the type of an error wrapped in SkyFunctionExceptions must be a subtype of Exception.

Similarly, restrict SchedulerException to only wrapping Exceptions. This is true in practice, but was missed in an earlier change.

--
MOS_MIGRATED_REVID=89127540

2 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/skyframe/Scheduler.java b/src/main/java/com/google/devtools/build/skyframe/Scheduler.java
index f05860f648..a3da7c8d33 100644
--- a/src/main/java/com/google/devtools/build/skyframe/Scheduler.java
+++ b/src/main/java/com/google/devtools/build/skyframe/Scheduler.java
@@ -42,7 +42,7 @@ interface Scheduler {
     private final SkyKey failedValue;
     private final ErrorInfo errorInfo;
 
-    private SchedulerException(@Nullable Throwable cause, @Nullable ErrorInfo errorInfo,
+    private SchedulerException(@Nullable Exception cause, @Nullable ErrorInfo errorInfo,
         SkyKey failedValue) {
       super(errorInfo != null ? errorInfo.getException() : cause);
       this.errorInfo = errorInfo;
diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionException.java b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionException.java
index 71b4710931..09d2c4c49e 100644
--- a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionException.java
+++ b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionException.java
@@ -94,7 +94,7 @@ public abstract class SkyFunctionException extends Exception {
     return (Exception) super.getCause();
   }
 
-  static <E extends Throwable> void validateExceptionType(Class<E> exceptionClass) {
+  static <E extends Exception> void validateExceptionType(Class<E> exceptionClass) {
     if (exceptionClass.equals(ValueOrExceptionUtils.BottomException.class)) {
       return;
     }