From 6b8c7ca48e9e48a9906c031346dc4a924b7ef559 Mon Sep 17 00:00:00 2001 From: janakr Date: Tue, 3 Jul 2018 13:18:36 -0700 Subject: In SkyframeExecutor#invalidateConfigurationCollection, actually delete the nodes, instead of invalidating them. Invalidating isn't sound, because we're depending on externally injected state to be re-read during evaluation. Also rename the method to resetConfigurationCollectionForTesting since it's only used in tests. PiperOrigin-RevId: 203172895 --- .../com/google/devtools/build/lib/skyframe/SkyframeExecutor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib') 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 1dc33282fb..09f665b8a9 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 @@ -734,12 +734,11 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory { /** Computes statistics on heap-resident rules and aspects. */ public abstract List getRuleStats(ExtendedEventHandler eventHandler); - /** - * Removes ConfigurationFragmentValues from the cache. - */ + /** Removes ConfigurationFragmentValues from the cache. */ @VisibleForTesting - public void invalidateConfigurationCollection() { - invalidate(SkyFunctionName.functionIsIn(ImmutableSet.of(SkyFunctions.CONFIGURATION_FRAGMENT))); + public void resetConfigurationCollectionForTesting() { + memoizingEvaluator.delete( + SkyFunctionName.functionIsIn(ImmutableSet.of(SkyFunctions.CONFIGURATION_FRAGMENT))); } /** -- cgit v1.2.3