Rename VariableContext to the more general purpose QueryExpressionContext and thread it through to graph traversal functions. Some other light refactorings as well.

PiperOrigin-RevId: 200292556

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/engine/BuildFilesFunction.java b/src/main/java/com/google/devtools/build/lib/query2/engine/BuildFilesFunction.java
index ac55028c17..06371f856c 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/engine/BuildFilesFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/engine/BuildFilesFunction.java
@@ -42,7 +42,7 @@ public class BuildFilesFunction implements QueryFunction {
   @Override
   public <T> QueryTaskFuture<Void> eval(
       final QueryEnvironment<T> env,
-      VariableContext<T> context,
+      QueryExpressionContext<T> context,
       final QueryExpression expression,
       List<Argument> args,
       final Callback<T> callback) {
@@ -56,9 +56,10 @@ public class BuildFilesFunction implements QueryFunction {
               throws QueryException, InterruptedException {
             ThreadSafeMutableSet<T> result = env.createThreadSafeMutableSet();
             Iterables.addAll(result, partialResult);
-            callback.process(uniquifier.unique(
-                env.getBuildFiles(
-                    expression, result, /* BUILD */ true, /* load */ true)));
+            callback.process(
+                uniquifier.unique(
+                    env.getBuildFiles(
+                        expression, result, /*buildFiles=*/ true, /*loads=*/ true, context)));
           }
         });
   }