1 files changed, 12 insertions, 18 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 343e59dbe8..3b22de7da6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -700,18 +700,21 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
   }
 
   // TODO(bazel-team): Make this take a PackageIdentifier.
-  public Map<PathFragment, Root> getArtifactRootsForFiles(final EventHandler eventHandler,
-      Iterable<PathFragment> execPaths) throws PackageRootResolutionException {
+  public Map<PathFragment, Root> getArtifactRootsForFiles(
+      final EventHandler eventHandler, Iterable<PathFragment> execPaths)
+      throws PackageRootResolutionException, InterruptedException {
     return getArtifactRoots(eventHandler, execPaths, true);
   }
 
-  public Map<PathFragment, Root> getArtifactRoots(final EventHandler eventHandler,
-      Iterable<PathFragment> execPaths) throws PackageRootResolutionException {
+  public Map<PathFragment, Root> getArtifactRoots(
+      final EventHandler eventHandler, Iterable<PathFragment> execPaths)
+      throws PackageRootResolutionException, InterruptedException {
     return getArtifactRoots(eventHandler, execPaths, false);
   }
 
-  private Map<PathFragment, Root> getArtifactRoots(final EventHandler eventHandler,
-      Iterable<PathFragment> execPaths, boolean forFiles) throws PackageRootResolutionException {
+  private Map<PathFragment, Root> getArtifactRoots(
+      final EventHandler eventHandler, Iterable<PathFragment> execPaths, boolean forFiles)
+      throws PackageRootResolutionException, InterruptedException {
 
     final List<SkyKey> packageKeys = new ArrayList<>();
     if (forFiles) {
@@ -731,18 +734,9 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory {
     }
 
     EvaluationResult<ContainingPackageLookupValue> result;
-    try {
-      result = callUninterruptibly(new Callable<EvaluationResult<ContainingPackageLookupValue>>() {
-        @Override
-        public EvaluationResult<ContainingPackageLookupValue> call() throws InterruptedException {
-          synchronized (valueLookupLock) {
-            return buildDriver.evaluate(
-                packageKeys, /*keepGoing=*/true, /*numThreads=*/1, eventHandler);
-          }
-        }
-      });
-    } catch (Exception e) {
-      throw new IllegalStateException(e);  // Should never happen.
+    synchronized (valueLookupLock) {
+      result =
+          buildDriver.evaluate(packageKeys, /*keepGoing=*/ true, /*numThreads=*/ 1, eventHandler);
     }
 
     if (result.hasError()) {