Enforce that the SkyKey returned by ActionLookupKey#getSkyKey is an ActionLookupKey. It was only being violated for some singleton keys.

Also do some drive-by cleanups of unused variables. Step approximately -2.

--
PiperOrigin-RevId: 150668944
MOS_MIGRATED_REVID=150668944

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusValue.java
index fca72dbc49..62f7858190 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceStatusValue.java
@@ -30,8 +30,8 @@ public class WorkspaceStatusValue extends ActionLookupValue {
   private final Artifact volatileArtifact;
 
   // There should only ever be one BuildInfo value in the graph.
-  public static final SkyKey SKY_KEY = SkyKey.create(SkyFunctions.BUILD_INFO, "BUILD_INFO");
   static final ArtifactOwner ARTIFACT_OWNER = new BuildInfoKey();
+  public static final SkyKey SKY_KEY = SkyKey.create(SkyFunctions.BUILD_INFO, ARTIFACT_OWNER);
 
   public WorkspaceStatusValue(Artifact stableArtifact, Artifact volatileArtifact,
       WorkspaceStatusAction action) {
@@ -55,7 +55,7 @@ public class WorkspaceStatusValue extends ActionLookupValue {
     }
 
     @Override
-    SkyKey getSkyKey() {
+    SkyKey getSkyKeyInternal() {
       return SKY_KEY;
     }
   }