From 9e91f20bb31e44b4be836996ac9d91af61e1e822 Mon Sep 17 00:00:00 2001
From: tomlu <tomlu@google.com>
Date: Mon, 18 Jun 2018 16:16:36 -0700
Subject: Remove support for --discard_actions_after_execution.

The memory savings from this flag are not worth the complexity, and it interferes with action restarting.

RELNOTES: Remove support for --discard_actions_after_execution.
PiperOrigin-RevId: 201077905
---
 .../com/google/devtools/build/lib/skyframe/AspectFunction.java | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java')

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 24cd665d6b..de5db333d1 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.skyframe;
 
 import com.google.common.base.Preconditions;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -102,7 +101,6 @@ import javax.annotation.Nullable;
 public final class AspectFunction implements SkyFunction {
   private final BuildViewProvider buildViewProvider;
   private final RuleClassProvider ruleClassProvider;
-  private final Supplier<Boolean> removeActionsAfterEvaluation;
   private final BuildOptions defaultBuildOptions;
   @Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining;
   /**
@@ -115,13 +113,11 @@ public final class AspectFunction implements SkyFunction {
   AspectFunction(
       BuildViewProvider buildViewProvider,
       RuleClassProvider ruleClassProvider,
-      Supplier<Boolean> removeActionsAfterEvaluation,
       @Nullable SkylarkImportLookupFunction skylarkImportLookupFunctionForInlining,
       boolean storeTransitivePackagesForPackageRootResolution,
       BuildOptions defaultBuildOptions) {
     this.buildViewProvider = buildViewProvider;
     this.ruleClassProvider = ruleClassProvider;
-    this.removeActionsAfterEvaluation = Preconditions.checkNotNull(removeActionsAfterEvaluation);
     this.skylarkImportLookupFunctionForInlining = skylarkImportLookupFunctionForInlining;
     this.storeTransitivePackagesForPackageRootResolution =
         storeTransitivePackagesForPackageRootResolution;
@@ -578,8 +574,7 @@ public final class AspectFunction implements SkyFunction {
         originalTarget.getLocation(),
         ConfiguredAspect.forAlias(real.getConfiguredAspect()),
         GeneratingActions.EMPTY,
-        transitivePackagesForPackageRootResolution,
-        removeActionsAfterEvaluation.get());
+        transitivePackagesForPackageRootResolution);
   }
 
   @Nullable
@@ -668,8 +663,7 @@ public final class AspectFunction implements SkyFunction {
         generatingActions,
         transitivePackagesForPackageRootResolution == null
             ? null
-            : transitivePackagesForPackageRootResolution.build(),
-        removeActionsAfterEvaluation.get());
+            : transitivePackagesForPackageRootResolution.build());
   }
 
   @Override
-- 
cgit v1.2.3