Replace Rule field in TestsInSuiteKey with a Label. In TestsInSuiteFunction,

request the Package for that Label, and in that way materialize the Rule.

Rule instances (which have a reference back to their Package) should not be in
SkyKeys, since they are large and slow down serialization.

PiperOrigin-RevId: 195294804

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
index 818ece3a85..3e68de0099 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TestsInSuiteFunction.java
@@ -53,8 +53,13 @@ final class TestsInSuiteFunction implements SkyFunction {
   @Override
   public SkyValue compute(SkyKey key, Environment env) throws InterruptedException {
     TestsInSuiteKey expansion = (TestsInSuiteKey) key.argument();
-    ResolvedTargets<Target> result =
-        computeTestsInSuite(env, expansion.getTestSuite(), expansion.isStrict());
+    SkyKey packageKey = PackageValue.key(expansion.getTestSuiteLabel().getPackageIdentifier());
+    PackageValue pkg = (PackageValue) env.getValue(packageKey);
+    if (env.valuesMissing()) {
+      return null;
+    }
+    Rule testSuite = pkg.getPackage().getRule(expansion.getTestSuiteLabel().getName());
+    ResolvedTargets<Target> result = computeTestsInSuite(env, testSuite, expansion.isStrict());
     if (env.valuesMissing()) {
       return null;
     }