Don't use null EvaluationProgressReceiver in MemoizingEvaluator (it was only null in AbstractPackageLoader and tests).

PiperOrigin-RevId: 183896826

3 files changed, 4 insertions, 15 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index e995c5cd4b..a079b3fca4 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -73,6 +73,7 @@ import com.google.devtools.build.lib.vfs.Root;
 import com.google.devtools.build.skyframe.BuildDriver;
 import com.google.devtools.build.skyframe.Differencer;
 import com.google.devtools.build.skyframe.ErrorInfo;
+import com.google.devtools.build.skyframe.EvaluationProgressReceiver;
 import com.google.devtools.build.skyframe.EvaluationResult;
 import com.google.devtools.build.skyframe.ImmutableDiff;
 import com.google.devtools.build.skyframe.InMemoryMemoizingEvaluator;
@@ -324,7 +325,7 @@ public abstract class AbstractPackageLoader implements PackageLoader {
         InMemoryMemoizingEvaluator.SUPPLIER.create(
             makeFreshSkyFunctions(),
             preinjectedDifferencer,
-            /*progressReceiver=*/ null,
+            new EvaluationProgressReceiver.NullEvaluationProgressReceiver(),
             new MemoizingEvaluator.EmittedEventState(),
             /*keepEdges=*/ false));
   }
diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
index 541d340783..5d29b82758 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryMemoizingEvaluator.java
@@ -386,17 +386,5 @@ public final class InMemoryMemoizingEvaluator implements MemoizingEvaluator {
         }
       };
 
-  public static final EvaluatorSupplier SUPPLIER =
-      new EvaluatorSupplier() {
-        @Override
-        public MemoizingEvaluator create(
-            ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
-            Differencer differencer,
-            @Nullable EvaluationProgressReceiver progressReceiver,
-            EmittedEventState emittedEventState,
-            boolean keepEdges) {
-          return new InMemoryMemoizingEvaluator(
-              skyFunctions, differencer, progressReceiver, emittedEventState, keepEdges);
-        }
-      };
+  public static final EvaluatorSupplier SUPPLIER = InMemoryMemoizingEvaluator::new;
 }
diff --git a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
index 562c2eaebc..5c7d386555 100644
--- a/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
+++ b/src/main/java/com/google/devtools/build/skyframe/MemoizingEvaluator.java
@@ -156,7 +156,7 @@ public interface MemoizingEvaluator {
     MemoizingEvaluator create(
         ImmutableMap<SkyFunctionName, ? extends SkyFunction> skyFunctions,
         Differencer differencer,
-        @Nullable EvaluationProgressReceiver progressReceiver,
+        EvaluationProgressReceiver progressReceiver,
         EmittedEventState emittedEventState,
         boolean keepEdges);
   }