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));
}