Small tweak to version injection logic to tolerate injecting versions…

… not comparable with the graph version. PiperOrigin-RevId: 423822037
fweikert · Jan 24, 2022 · 440e16d · 440e16d
1 parent e2abe2b
commit 440e16d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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
@@ -243,12 +243,12 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory, Configur
   protected MemoizingEvaluator memoizingEvaluator;
   private final MemoizingEvaluator.EmittedEventState emittedEventState =
       new MemoizingEvaluator.EmittedEventState();
-  private final PackageFactory pkgFactory;
+  protected final PackageFactory pkgFactory;
   private final WorkspaceStatusAction.Factory workspaceStatusActionFactory;
   private final FileSystem fileSystem;
   protected final BlazeDirectories directories;
   protected final ExternalFilesHelper externalFilesHelper;
-  private final BugReporter bugReporter;
+  protected final BugReporter bugReporter;
 
   /**
    * Measures source artifacts read this build. Does not include cached artifacts, so is less useful

diff --git a/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java b/src/main/java/com/google/devtools/build/skyframe/SkyFunctionEnvironment.java
@@ -922,7 +922,7 @@ public void injectVersionForNonHermeticFunction(Version version) {
         skyKey);
     Preconditions.checkNotNull(version, skyKey);
     Preconditions.checkState(
-        version.atMost(evaluatorContext.getGraphVersion()),
+        !evaluatorContext.getGraphVersion().lowerThan(version),
         "Invalid injected version (%s > %s) for %s",
         version,
         evaluatorContext.getGraphVersion(),