Skip to content

Commit

Permalink
Remove the stale reference to IncrementalPackageRoots in SkyframeExec…
Browse files Browse the repository at this point in the history
…utor.

This was first added so that we can shut down the IncrementalPackageRoots instance via SkyframeExecutor. We don't need that anymore since the shutdown process is now triggered by the AnalysisPhaseComplete event.

PiperOrigin-RevId: 518202993
Change-Id: I92a6c30c015fda038f3f747e8036878a4a17d6db
  • Loading branch information
joeleba authored and copybara-github committed Mar 21, 2023
1 parent a20728b commit cd4e142
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ public void prepareForExecution(UUID buildId)
env.getDirectories().getProductName() + "-",
request.getOptions(BuildLanguageOptions.class).experimentalSiblingRepositoryLayout);
incrementalPackageRoots.eagerlyPlantSymlinksToSingleSourceRoot();
skyframeExecutor.setIncrementalPackageRoots(incrementalPackageRoots);

// We don't plant the symlinks via the subscribers of this ExecRootPreparedEvent, but rather
// via IncrementalPackageRoots.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,6 @@ public abstract class SkyframeExecutor implements WalkableGraphFactory, Configur
private RuleContextConstraintSemantics ruleContextConstraintSemantics;
private RegexFilter extraActionFilter;

// Reset while preparing for execution in each build.
private Optional<IncrementalPackageRoots> incrementalPackageRoots = Optional.empty();

// This boolean controls whether FILE_STATE or DIRECTORY_LISTING_STATE nodes are dropped after the
// corresponding FILE or DIRECTORY_LISTING nodes are evaluated.
// See b/261019506.
Expand Down Expand Up @@ -2303,17 +2300,10 @@ EvaluationResult<BuildDriverValue> evaluateBuildDriverKeys(
}
}

public void setIncrementalPackageRoots(IncrementalPackageRoots incrementalPackageRoots) {
this.incrementalPackageRoots = Optional.of(incrementalPackageRoots);
}

/** Called after a single Skyframe evaluation that involves action execution. */
private void cleanUpAfterSingleEvaluationWithActionExecution(ExtendedEventHandler eventHandler) {
setExecutionProgressReceiver(null);

if (incrementalPackageRoots.isPresent()) {
incrementalPackageRoots = Optional.empty();
}
skyframeActionExecutor.executionOver();
actionExecutionFunction.complete(eventHandler);
}
Expand Down

0 comments on commit cd4e142

Please sign in to comment.