Fix the strict-ordering of symlinks created with Filesets which was inadvartently lost due to https://github.com/bazelbuild/bazel/commit/d8ba904a3b0598e97601bc670840e39f21799ead

RELNOTES: none
PiperOrigin-RevId: 171204884

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
index 5dbed59c10..064ab4ba65 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunction.java
@@ -71,13 +71,14 @@ public final class FilesetEntryFunction implements SkyFunction {
       // The absence of "direct" traversal indicates the presence of a "nested" fileset and
       // getNestedTraversal will return the list FilesetTraversalParams corresponding to each
       // FilesetEntry of the nested Fileset.
-      Map<SkyKey, SkyValue> results = env.getValues(FilesetEntryValue.keys(t.getNestedTraversal()));
+      ImmutableList<SkyKey> nestedKeys = FilesetEntryValue.keys(t.getNestedTraversal());
+      Map<SkyKey, SkyValue> results = env.getValues(nestedKeys);
       if (env.valuesMissing()) {
         return null;
       }
 
-      for (SkyValue value : results.values()) {
-        FilesetEntryValue nested = (FilesetEntryValue) value;
+      for (SkyKey nestedKey : nestedKeys) {
+        FilesetEntryValue nested = (FilesetEntryValue) results.get(nestedKey);
         for (FilesetOutputSymlink s : nested.getSymlinks()) {
           if (!exclusions.contains(s.name.getPathString())) {
             maybeStoreSymlink(s, t.getDestPath(), outputSymlinks);