Description redacted.

--
MOS_MIGRATED_REVID=86738858

1 files changed, 4 insertions, 1 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 b7d638528d..9be7077ce7 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
@@ -585,7 +585,10 @@ public abstract class SkyframeExecutor {
       result = callUninterruptibly(new Callable<EvaluationResult<ContainingPackageLookupValue>>() {
         @Override
         public EvaluationResult<ContainingPackageLookupValue> call() throws InterruptedException {
-          return buildDriver.evaluate(packageKeys, /*keepGoing=*/true, /*numThreads=*/1, reporter);
+          synchronized (valueLookupLock) {
+            return buildDriver.evaluate(
+                packageKeys, /*keepGoing=*/true, /*numThreads=*/1, reporter);
+          }
         }
       });
     } catch (Exception e) {