The rbuildfiles operator in blaze query now correctly handles loads and subincludes of files in subdirectories of a package.

--
MOS_MIGRATED_REVID=102659838

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index fa4e6e2ab4..f18b5b3162 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -545,16 +545,16 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target> {
       Map<SkyKey, SkyValue> lookupValues = graph.getDoneValues(keys.keySet());
       for (Map.Entry<SkyKey, SkyValue> entry : lookupValues.entrySet()) {
         PackageLookupValue packageLookupValue = (PackageLookupValue) entry.getValue();
-        PathFragment dir = keys.get(entry.getKey());
         if (packageLookupValue.packageExists()) {
+          PathFragment dir = keys.get(entry.getKey());
           Collection<PathFragment> originalFiles = currentToOriginal.get(dir);
           Preconditions.checkState(!originalFiles.isEmpty(), entry);
           for (PathFragment fileName : originalFiles) {
             result.add(
                 FileValue.key(RootedPath.toRootedPath(packageLookupValue.getRoot(), fileName)));
           }
+          currentToOriginal.removeAll(dir);
         }
-        currentToOriginal.removeAll(dir);
       }
       Multimap<PathFragment, PathFragment> newCurrentToOriginal = ArrayListMultimap.create();
       for (PathFragment pathFragment : currentToOriginal.keySet()) {