commit baefeabefc64bb30c293a3dfa9e45a0017b7696b
author Googler <noreply@google.com> Tue Apr 30 17:12:55 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 30 17:13:53 2019 -0700
tree 3f98c28c47db0490c9625cf5ed3de576fca298d5
parent f2b386cedb3ec262c05139ffdc38eda7f57a7488

Type-check tests for @GroupedList.Compressed.

Each test enforces that all objects referenced by @GroupedList.Compressed in the package originate from one of the annotated static methods in GroupedList.

To be submitted after https://github.com/bazelbuild/bazel/pull/8212.

PiperOrigin-RevId: 246052739

src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java

diff --git a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
index 94d6de2..4b348b9 100644
--- a/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
+++ b/src/main/java/com/google/devtools/build/skyframe/InMemoryNodeEntry.java
@@ -138,11 +138,8 @@
    */
   @Nullable protected volatile DirtyBuildingState dirtyBuildingState = null;
 
-  /**
-   * Construct a InMemoryNodeEntry. Use ONLY in Skyframe evaluation and graph implementations.
-   */
-  public InMemoryNodeEntry() {
-  }
+  /** Construct a InMemoryNodeEntry. Use ONLY in Skyframe evaluation and graph implementations. */
+  public InMemoryNodeEntry() {}
 
   // Public only for use in alternate graph implementations.
   public KeepEdgesPolicy keepEdges() {
@@ -218,12 +215,12 @@
   public synchronized @GroupedList.Compressed Object getCompressedDirectDepsForDoneEntry() {
     assertKeepDeps();
     Preconditions.checkState(isDone(), "no deps until done. NodeEntry: %s", this);
-    return Preconditions.checkNotNull(directDeps, "deps can't be null: %s", this);
+    Preconditions.checkNotNull(directDeps, "deps can't be null: %s", this);
+    return GroupedList.castAsCompressed(directDeps);
   }
 
   public int getNumDirectDeps() {
-    Preconditions.checkState(isDone(), "no deps until done. NodeEntry: %s", this);
-    return GroupedList.numElements(directDeps);
+    return GroupedList.numElements(getCompressedDirectDepsForDoneEntry());
   }
 
   @Override
@@ -520,7 +517,8 @@
     assertKeepDeps();
     if (isDone()) {
       dirtyBuildingState =
-          DirtyBuildingState.create(dirtyType, GroupedList.create(directDeps), value);
+          DirtyBuildingState.create(
+              dirtyType, GroupedList.create(getCompressedDirectDepsForDoneEntry()), value);
       value = null;
       directDeps = null;
       return new MarkedDirtyResult(ReverseDepsUtility.getReverseDeps(this));
@@ -733,7 +731,7 @@
         .add(
             "directDeps",
             isDone() && keepEdges() != KeepEdgesPolicy.NONE
-                ? GroupedList.create(directDeps)
+                ? GroupedList.create(getCompressedDirectDepsForDoneEntry())
                 : directDeps)
         .add("reverseDeps", ReverseDepsUtility.toString(this))
         .add("dirtyBuildingState", dirtyBuildingState);