Minor cleanup.
PiperOrigin-RevId: 547797095
Change-Id: I824c74525cbfae428c8043a3b8ab68629817c48a
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
index 3dc808c..70fa69d 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunction.java
@@ -385,27 +385,21 @@
if (env.valuesMissing()) {
return null;
}
- return toFileInfo(fileValue, env, traversal.root().asPath(), traversal, syscallCache);
+ return toFileInfo(fileValue, env, traversal.root().asPath(), syscallCache);
}
}
@Nullable
private static FileInfo toFileInfo(
- FileValue fileValue,
- Environment env,
- Path path,
- TraversalRequest traversal,
- SyscallCache syscallCache)
+ FileValue fileValue, Environment env, Path path, SyscallCache syscallCache)
throws IOException, InterruptedException {
if (fileValue.unboundedAncestorSymlinkExpansionChain() != null) {
- if (traversal.reportInfiniteSymlinkExpansionErrors()) {
- SkyKey uniquenessKey =
- FileSymlinkInfiniteExpansionUniquenessFunction.key(
- fileValue.unboundedAncestorSymlinkExpansionChain());
- env.getValue(uniquenessKey);
- if (env.valuesMissing()) {
- return null;
- }
+ SkyKey uniquenessKey =
+ FileSymlinkInfiniteExpansionUniquenessFunction.key(
+ fileValue.unboundedAncestorSymlinkExpansionChain());
+ env.getValue(uniquenessKey);
+ if (env.valuesMissing()) {
+ return null;
}
throw new FileSymlinkInfiniteExpansionException(
@@ -725,8 +719,7 @@
if (key instanceof FileValue.Key) {
FileValue.Key fileKey = (FileValue.Key) key;
FileInfo fileInfo =
- toFileInfo(
- (FileValue) value, env, fileKey.argument().asPath(), traversal, syscallCache);
+ toFileInfo((FileValue) value, env, fileKey.argument().asPath(), syscallCache);
if (fileInfo != null) {
childValues.add(resultForFileRoot(fileKey.argument(), fileInfo));
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
index 7f1ea8e..9a23159 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RuleConfiguredTargetValue.java
@@ -17,7 +17,6 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.devtools.build.lib.actions.ActionAnalysisMetadata;
-import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.ConfiguredTargetValue;
import com.google.devtools.build.lib.analysis.RuleConfiguredObjectValue;
import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
@@ -59,7 +58,7 @@
@Nullable // May be null after clearing.
@Override
- public ConfiguredTarget getConfiguredTarget() {
+ public RuleConfiguredTarget getConfiguredTarget() {
return configuredTarget;
}
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 bfa996c..1c75a26 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
@@ -98,7 +98,6 @@
import com.google.devtools.build.lib.analysis.config.CoreOptions;
import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
import com.google.devtools.build.lib.analysis.config.transitions.ConfigurationTransition;
-import com.google.devtools.build.lib.analysis.configuredtargets.RuleConfiguredTarget;
import com.google.devtools.build.lib.analysis.constraints.RuleContextConstraintSemantics;
import com.google.devtools.build.lib.analysis.producers.ConfiguredTargetAndDataProducer;
import com.google.devtools.build.lib.analysis.producers.DependencyError;
@@ -1155,8 +1154,7 @@
}
/** Signals whether nodes (or some internal node data) can be removed from the analysis cache. */
- @ForOverride
- protected boolean processDiscardAndDetermineRemoval(
+ private static boolean processDiscardAndDetermineRemoval(
InMemoryNodeEntry entry,
DiscardType discardType,
ImmutableSet<PackageIdentifier> topLevelPackages,
@@ -2962,7 +2960,7 @@
if (!(newValue instanceof RuleConfiguredTargetValue)) {
return;
}
- var t = (RuleConfiguredTarget) ((RuleConfiguredTargetValue) newValue).getConfiguredTarget();
+ var t = ((RuleConfiguredTargetValue) newValue).getConfiguredTarget();
if (!t.getRuleClassString().equals("genquery")) {
return;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TraversalRequest.java b/src/main/java/com/google/devtools/build/lib/skyframe/TraversalRequest.java
index ed6941e..e831ecb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TraversalRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TraversalRequest.java
@@ -68,15 +68,6 @@
protected abstract String errorInfo();
/**
- * Determines whether events for {@linkplain
- * com.google.devtools.build.lib.io.FileSymlinkInfiniteExpansionException infinite symlink
- * expansion errors} encountered during the traversal should be emitted.
- */
- protected boolean reportInfiniteSymlinkExpansionErrors() {
- return true;
- }
-
- /**
* Creates a new traversal request identical to this one except with the given new values for
* {@link #root} and {@link #skipTestingForSubpackage}.
*/
@@ -118,7 +109,6 @@
.add("strictOutputFiles", strictOutputFiles())
.add("skipTestingForSubpackage", skipTestingForSubpackage())
.add("errorInfo", errorInfo())
- .add("reportInfiniteSymlinkExpansionErrors", reportInfiniteSymlinkExpansionErrors())
.toString();
}
}
