Remove OMITTED_FILE_MARKER and OMITTED_TREE_MARKER.
Now that metadata for omitted files is tracked, there is no reason to keep these two around.
RELNOTES: None.
PiperOrigin-RevId: 689813910
Change-Id: I67b19a33c35cd99c43b231cb9c55f2de25c35c93
diff --git a/src/main/java/com/google/devtools/build/lib/actions/ActionInputMap.java b/src/main/java/com/google/devtools/build/lib/actions/ActionInputMap.java
index 04b54a8..4f161c5 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/ActionInputMap.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/ActionInputMap.java
@@ -380,14 +380,8 @@
return;
}
- // Overwrite the placeholder.
- if (treeArtifactValue.equals(TreeArtifactValue.OMITTED_TREE_MARKER)) {
- // No trie entry for omitted tree -- it cannot have any children anyway.
- values[size - 1] = FileArtifactValue.OMITTED_FILE_MARKER;
- } else {
- treeArtifactsRoot.add(tree.getExecPath(), treeArtifactValue);
- values[size - 1] = treeArtifactValue;
- }
+ treeArtifactsRoot.add(tree.getExecPath(), treeArtifactValue);
+ values[size - 1] = treeArtifactValue;
}
public void putWithNoDepOwner(ActionInput input, FileArtifactValue metadata) {
diff --git a/src/main/java/com/google/devtools/build/lib/actions/CompletionContext.java b/src/main/java/com/google/devtools/build/lib/actions/CompletionContext.java
index d4d51f6..6eeb34c 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/CompletionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/CompletionContext.java
@@ -156,10 +156,7 @@
"missing artifact metadata for tree artifact: %s",
artifact.toDebugString())));
}
- if (FileArtifactValue.OMITTED_FILE_MARKER.equals(treeArtifactMetadata)) {
- // Expansion can be missing for omitted tree artifacts -- skip the whole tree.
- continue;
- }
+
TreeArtifactValue treeValue =
checkNotNull(
treeArtifacts.get(artifact), "Missing expansion for tree artifact: %s", artifact);
diff --git a/src/main/java/com/google/devtools/build/lib/actions/FileArtifactValue.java b/src/main/java/com/google/devtools/build/lib/actions/FileArtifactValue.java
index 3d820e89..774175e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FileArtifactValue.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FileArtifactValue.java
@@ -192,12 +192,6 @@
/** Data that marks that a file is not present on the filesystem. */
@SerializationConstant
public static final FileArtifactValue MISSING_FILE_MARKER = new SingletonMarkerValue();
- /**
- * Represents an omitted file -- we are aware of it but it doesn't exist. All access methods are
- * unsupported.
- */
- @SerializationConstant
- public static final FileArtifactValue OMITTED_FILE_MARKER = new OmittedFileValue();
public static FileArtifactValue createForSourceArtifact(
Artifact artifact, FileValue fileValue, XattrProvider xattrProvider) throws IOException {
@@ -978,41 +972,4 @@
return "singleton marker artifact value (" + hashCode() + ")";
}
}
-
- private static final class OmittedFileValue extends FileArtifactValue implements Singleton {
- @Override
- public FileStateType getType() {
- return FileStateType.NONEXISTENT;
- }
-
- @Override
- public byte[] getDigest() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public FileContentsProxy getContentsProxy() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getSize() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public long getModifiedTime() {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean wasModifiedSinceDigest(Path path) {
- return false;
- }
-
- @Override
- public String toString() {
- return "OMITTED_FILE_MARKER";
- }
- }
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
index 9a596d5..e0db37b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionExecutionValue.java
@@ -76,9 +76,6 @@
});
treeArtifactData.forEach(
(tree, treeValue) -> {
- if (TreeArtifactValue.OMITTED_TREE_MARKER.equals(treeValue)) {
- return;
- }
treeValue
.getChildValues()
.forEach(
@@ -269,10 +266,6 @@
Artifact newArtifact, TreeArtifactValue tree) {
checkState(newArtifact.isTreeArtifact(), "Expected tree artifact, got %s", newArtifact);
- if (TreeArtifactValue.OMITTED_TREE_MARKER.equals(tree)) {
- return TreeArtifactValue.OMITTED_TREE_MARKER;
- }
-
SpecialArtifact newParent = (SpecialArtifact) newArtifact;
TreeArtifactValue.Builder newTree = TreeArtifactValue.newBuilder(newParent);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMapHelper.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMapHelper.java
index 50cc96a..c9583cb 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMapHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMapHelper.java
@@ -197,11 +197,6 @@
BiConsumer<Artifact, TreeArtifactValue> treeArtifactConsumer,
ActionInputMapSink inputMap,
Artifact depOwner) {
- if (TreeArtifactValue.OMITTED_TREE_MARKER.equals(value)) {
- inputMap.putTreeArtifact((SpecialArtifact) treeArtifact, value, depOwner);
- return;
- }
-
treeArtifactConsumer.accept(treeArtifact, value);
inputMap.putTreeArtifact((SpecialArtifact) treeArtifact, value, depOwner);
addArchivedTreeArtifactMaybe(value, inputMap, depOwner);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMetadataProvider.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMetadataProvider.java
index 68bab8c..d7ef71a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMetadataProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionInputMetadataProvider.java
@@ -128,8 +128,7 @@
*/
private static FileArtifactValue checkExists(FileArtifactValue value, Artifact artifact)
throws FileNotFoundException {
- if (FileArtifactValue.MISSING_FILE_MARKER.equals(value)
- || FileArtifactValue.OMITTED_FILE_MARKER.equals(value)) {
+ if (FileArtifactValue.MISSING_FILE_MARKER.equals(value)) {
throw new FileNotFoundException(artifact + " does not exist");
}
return checkNotNull(value, artifact);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java b/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java
index d9f9c53..735d6ae 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ActionOutputMetadataStore.java
@@ -158,8 +158,7 @@
*/
private static FileArtifactValue checkExists(FileArtifactValue value, Artifact artifact)
throws FileNotFoundException {
- if (FileArtifactValue.MISSING_FILE_MARKER.equals(value)
- || FileArtifactValue.OMITTED_FILE_MARKER.equals(value)) {
+ if (FileArtifactValue.MISSING_FILE_MARKER.equals(value)) {
throw new FileNotFoundException(artifact + " does not exist");
}
return checkNotNull(value, artifact);
@@ -171,8 +170,7 @@
*/
private static TreeArtifactValue checkExists(TreeArtifactValue value, Artifact artifact)
throws FileNotFoundException {
- if (TreeArtifactValue.MISSING_TREE_ARTIFACT.equals(value)
- || TreeArtifactValue.OMITTED_TREE_MARKER.equals(value)) {
+ if (TreeArtifactValue.MISSING_TREE_ARTIFACT.equals(value)) {
throw new FileNotFoundException(artifact + " does not exist");
}
return checkNotNull(value, artifact);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
index 65d2e6a..9b12ffa 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactFunction.java
@@ -242,7 +242,6 @@
// parent TreeArtifact.
SpecialArtifact parent = (SpecialArtifact) artifactDependencies.artifact;
TreeArtifactValue.Builder treeBuilder = TreeArtifactValue.newBuilder(parent);
- boolean omitted = false;
for (ActionLookupData actionKey : expandedActionExecutionKeys) {
boolean sawTreeChild = false;
@@ -265,11 +264,7 @@
if (artifact.getParent().equals(parent)) {
sawTreeChild = true;
- if (FileArtifactValue.OMITTED_FILE_MARKER.equals(entry.getValue())) {
- omitted = true;
- } else {
- treeBuilder.putChild((TreeFileArtifact) artifact, entry.getValue());
- }
+ treeBuilder.putChild((TreeFileArtifact) artifact, entry.getValue());
}
}
@@ -281,17 +276,6 @@
}
TreeArtifactValue tree = treeBuilder.build();
-
- if (omitted) {
- // Expected 1 args, but got 2.
- Preconditions.checkState(
- tree.getChildValues().isEmpty(),
- "Action template expansion has some but not all outputs omitted, present outputs: %s",
- artifactDependencies,
- tree.getChildValues());
- return TreeArtifactValue.OMITTED_TREE_MARKER;
- }
-
return tree;
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
index 2295e87..6429b00 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeActionExecutor.java
@@ -1290,15 +1290,12 @@
}
FileArtifactValue primaryOutputMetadata;
- if (outputMetadataStore.artifactOmitted(primaryOutput)) {
- primaryOutputMetadata = FileArtifactValue.OMITTED_FILE_MARKER;
- } else {
- try {
- primaryOutputMetadata = outputMetadataStore.getOutputMetadata(primaryOutput);
- } catch (IOException e) {
- throw new IllegalStateException("Metadata already obtained for " + primaryOutput, e);
- }
+ try {
+ primaryOutputMetadata = outputMetadataStore.getOutputMetadata(primaryOutput);
+ } catch (IOException e) {
+ throw new IllegalStateException("Metadata already obtained for " + primaryOutput, e);
}
+
reportActionExecution(
eventHandler,
primaryOutputPath,
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
index 5cac9e8..1699b0b 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TreeArtifactValue.java
@@ -414,13 +414,6 @@
}
/**
- * Represents a tree artifact that was intentionally omitted, similar to {@link
- * FileArtifactValue#OMITTED_FILE_MARKER}.
- */
- @SerializationConstant
- public static final TreeArtifactValue OMITTED_TREE_MARKER = createMarker("OMITTED_TREE_MARKER");
-
- /**
* A TreeArtifactValue that represents a missing TreeArtifact. This is occasionally useful because
* Java's concurrent collections disallow null members.
*/
@@ -635,11 +628,6 @@
* <p>Children may be added in any order. The children are sorted prior to constructing the
* final {@link TreeArtifactValue}.
*
- * <p>It is illegal to call this method with {@link FileArtifactValue#OMITTED_FILE_MARKER}. When
- *
- * <p>It is illegal to call this method with {@link FileArtifactValue#OMITTED_FILE_MARKER}. When
- * children are omitted, use {@link TreeArtifactValue#OMITTED_TREE_MARKER}.
- *
* @return {@code this} for convenience
*/
@CanIgnoreReturnValue
@@ -650,11 +638,6 @@
parent,
child,
child.getParent());
- checkArgument(
- !FileArtifactValue.OMITTED_FILE_MARKER.equals(metadata),
- "Cannot construct TreeArtifactValue for %s because child %s was omitted",
- parent,
- child);
childData.put(child, metadata);
return this;
}
@@ -676,11 +659,6 @@
"Cannot add archived representation: %s for a mismatching tree artifact: %s",
archivedRepresentation,
parent);
- checkArgument(
- !archivedRepresentation.archivedFileValue().equals(FileArtifactValue.OMITTED_FILE_MARKER),
- "Cannot add archived representation: %s to %s because it has omitted metadata.",
- archivedRepresentation,
- parent);
this.archivedRepresentation = archivedRepresentation;
return this;
}
diff --git a/src/test/java/com/google/devtools/build/lib/actions/ActionInputMapTest.java b/src/test/java/com/google/devtools/build/lib/actions/ActionInputMapTest.java
index a6a4a28..8662e92 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/ActionInputMapTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/ActionInputMapTest.java
@@ -260,18 +260,6 @@
}
@Test
- public void putTreeArtifact_omittedTree_addsEntryWithNoChildren() {
- SpecialArtifact tree = createTreeArtifact("tree");
-
- map.putTreeArtifact(tree, TreeArtifactValue.OMITTED_TREE_MARKER, /*depOwner=*/ null);
-
- // Cannot assertContainsTree since TreeArtifactValue#getMetadata throws for OMITTED_TREE_MARKER.
- assertThat(map.getInputMetadata(tree)).isSameInstanceAs(FileArtifactValue.OMITTED_FILE_MARKER);
- assertThat(map.getMetadata(tree.getExecPath()))
- .isSameInstanceAs(FileArtifactValue.OMITTED_FILE_MARKER);
- }
-
- @Test
public void put_treeFileArtifact_addsEntry() {
TreeFileArtifact treeFile =
TreeFileArtifact.createTreeOutput(createTreeArtifact("tree"), "file");
@@ -363,15 +351,6 @@
}
@Test
- public void getMetadata_treeFileUnderOmittedParent_fails() {
- SpecialArtifact tree = createTreeArtifact("tree");
- TreeFileArtifact child = TreeFileArtifact.createTreeOutput(tree, "file");
- map.putTreeArtifact(tree, TreeArtifactValue.OMITTED_TREE_MARKER, /*depOwner=*/ null);
-
- assertThrows(IllegalArgumentException.class, () -> map.getInputMetadata(child));
- }
-
- @Test
public void getInputMetadata_treeFileUnderFile_fails() {
SpecialArtifact tree = createTreeArtifact("tree");
TreeFileArtifact child = TreeFileArtifact.createTreeOutput(tree, "file");
diff --git a/src/test/java/com/google/devtools/build/lib/actions/CompletionContextTest.java b/src/test/java/com/google/devtools/build/lib/actions/CompletionContextTest.java
index 4d9c0d0..2714807 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/CompletionContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/CompletionContextTest.java
@@ -95,15 +95,6 @@
}
@Test
- public void treeArtifact_omitted() {
- SpecialArtifact tree = createTreeArtifact("tree");
- inputMap.putTreeArtifact(tree, TreeArtifactValue.OMITTED_TREE_MARKER, /* depOwner= */ null);
- CompletionContext ctx = createCompletionContext(/* expandFilesets= */ true);
-
- assertThat(visit(ctx, tree)).isEmpty();
- }
-
- @Test
public void fileset_noExpansion() {
SpecialArtifact fileset = createFileset("fs");
inputMap.put(fileset, DUMMY_METADATA, /* depOwner= */ null);
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
index 9dba383..4a72b88 100644
--- a/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BuildEventStreamerTest.java
@@ -159,7 +159,7 @@
/* exception= */ null,
ActionsTestUtil.DUMMY_ARTIFACT.getPath(),
ActionsTestUtil.DUMMY_ARTIFACT,
- FileArtifactValue.OMITTED_FILE_MARKER,
+ FileArtifactValue.MISSING_FILE_MARKER,
/* stdout= */ null,
/* stderr= */ null,
/* actionMetadataLogs= */ ImmutableList.of(),
@@ -1793,7 +1793,7 @@
/* exception= */ null,
ActionsTestUtil.DUMMY_ARTIFACT.getPath(),
ActionsTestUtil.DUMMY_ARTIFACT,
- FileArtifactValue.OMITTED_FILE_MARKER,
+ FileArtifactValue.MISSING_FILE_MARKER,
/* stdout= */ null,
/* stderr= */ null,
metadataLogs,
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
index 34c60d4..a373895 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ArtifactFunctionTest.java
@@ -66,9 +66,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -81,11 +79,9 @@
@RunWith(JUnit4.class)
public class ArtifactFunctionTest extends ArtifactFunctionTestCase {
- private final Set<Artifact> omittedOutputs = new HashSet<>();
-
@Before
public final void setUp() {
- delegateActionExecutionFunction = new SimpleActionExecutionFunction(omittedOutputs);
+ delegateActionExecutionFunction = new SimpleActionExecutionFunction();
}
private void assertFileArtifactValueMatches() throws Exception {
@@ -270,60 +266,6 @@
assertThat(value.getChildValues().get(treeFileArtifact2).getDigest()).isNotNull();
}
- @Test
- public void actionTemplateExpansionOutputsOmitted() throws Throwable {
- // artifact1 is a tree artifact generated by normal action.
- SpecialArtifact artifact1 = createDerivedTreeArtifactWithAction("treeArtifact1");
- createFakeTreeFileArtifact(artifact1, "child1", "hello1");
- createFakeTreeFileArtifact(artifact1, "child2", "hello2");
-
- // artifact2 is a tree artifact generated by action template.
- SpecialArtifact artifact2 = createDerivedTreeArtifactOnly("treeArtifact2");
- SpawnActionTemplate actionTemplate =
- ActionsTestUtil.createDummySpawnActionTemplate(artifact1, artifact2);
- actions.add(actionTemplate);
- TreeFileArtifact treeFileArtifact1 =
- createFakeExpansionTreeFileArtifact(actionTemplate, "child1", "hello1");
- TreeFileArtifact treeFileArtifact2 =
- createFakeExpansionTreeFileArtifact(actionTemplate, "child2", "hello2");
-
- omittedOutputs.add(treeFileArtifact1);
- omittedOutputs.add(treeFileArtifact2);
-
- SkyValue value = evaluateArtifactValue(artifact2);
- assertThat(value).isEqualTo(TreeArtifactValue.OMITTED_TREE_MARKER);
- }
-
- @Test
- public void cannotOmitSomeButNotAllActionTemplateExpansionOutputs() throws Throwable {
- // artifact1 is a tree artifact generated by normal action.
- SpecialArtifact artifact1 = createDerivedTreeArtifactWithAction("treeArtifact1");
- createFakeTreeFileArtifact(artifact1, "child1", "hello1");
- createFakeTreeFileArtifact(artifact1, "child2", "hello2");
-
- // artifact2 is a tree artifact generated by action template.
- SpecialArtifact artifact2 = createDerivedTreeArtifactOnly("treeArtifact2");
- SpawnActionTemplate actionTemplate =
- ActionsTestUtil.createDummySpawnActionTemplate(artifact1, artifact2);
- actions.add(actionTemplate);
- TreeFileArtifact treeFileArtifact1 =
- createFakeExpansionTreeFileArtifact(actionTemplate, "child1", "hello1");
- TreeFileArtifact treeFileArtifact2 =
- createFakeExpansionTreeFileArtifact(actionTemplate, "child2", "hello2");
-
- omittedOutputs.add(treeFileArtifact1);
-
- Exception e = assertThrows(RuntimeException.class, () -> evaluateArtifactValue(artifact2));
- assertThat(e).hasCauseThat().isInstanceOf(IllegalStateException.class);
- assertThat(e)
- .hasCauseThat()
- .hasMessageThat()
- .matches(
- "Action template expansion has some but not all outputs omitted, present outputs: .*"
- + treeFileArtifact2.getParentRelativePath()
- + ".*");
- }
-
private static void file(Path path, String contents) throws Exception {
path.getParentDirectory().createDirectoryAndParents();
writeFile(path, contents);
@@ -455,11 +397,7 @@
* orphaned or exist).
*/
private static final class SimpleActionExecutionFunction implements SkyFunction {
- private final Set<Artifact> omittedOutputs;
-
- SimpleActionExecutionFunction(Set<Artifact> omittedOutputs) {
- this.omittedOutputs = omittedOutputs;
- }
+ SimpleActionExecutionFunction() {}
@Override
public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException {
@@ -472,10 +410,7 @@
Artifact output = Iterables.getOnlyElement(action.getOutputs());
try {
- if (omittedOutputs.contains(output)) {
- Preconditions.checkState(!output.isTreeArtifact(), "Cannot omit %s", output);
- artifactData.put(output, FileArtifactValue.OMITTED_FILE_MARKER);
- } else if (output.isTreeArtifact()) {
+ if (output.isTreeArtifact()) {
SpecialArtifact parent = (SpecialArtifact) output;
TreeFileArtifact treeFileArtifact1 =
TreeFileArtifact.createTreeOutput((SpecialArtifact) output, "child1");
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java
index f3538d1..b2e3984 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FileArtifactValueTest.java
@@ -91,7 +91,6 @@
// expireAtEpochMilli doesn't contribute to the equality
RemoteFileArtifactValue.create(toBytes("00112233445566778899AABBCCDDEEFF"), 1, 1, 1),
RemoteFileArtifactValue.create(toBytes("00112233445566778899AABBCCDDEEFF"), 1, 1, 2))
- .addEqualityGroup(FileArtifactValue.OMITTED_FILE_MARKER)
.addEqualityGroup(FileArtifactValue.MISSING_FILE_MARKER)
.addEqualityGroup(FileArtifactValue.DEFAULT_MIDDLEMAN)
.addEqualityGroup("a string")
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java
index 6bc4475..369c096 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java
@@ -217,31 +217,6 @@
}
@Test
- public void cannotAddOmittedChildToBuilder() {
- SpecialArtifact parent = createTreeArtifact("bin/tree");
- TreeFileArtifact child = TreeFileArtifact.createTreeOutput(parent, "child");
-
- TreeArtifactValue.Builder builder = TreeArtifactValue.newBuilder(parent);
-
- assertThrows(
- IllegalArgumentException.class,
- () -> builder.putChild(child, FileArtifactValue.OMITTED_FILE_MARKER));
- }
-
- @Test
- public void cannotAddOmittedArchivedRepresentation() {
- SpecialArtifact parent = createTreeArtifact("bin/tree");
- ArchivedTreeArtifact archivedTreeArtifact = createArchivedTreeArtifact(parent);
- TreeArtifactValue.Builder builder = TreeArtifactValue.newBuilder(parent);
-
- assertThrows(
- IllegalArgumentException.class,
- () ->
- builder.setArchivedRepresentation(
- archivedTreeArtifact, FileArtifactValue.OMITTED_FILE_MARKER));
- }
-
- @Test
public void orderIndependence() {
SpecialArtifact parent = createTreeArtifact("bin/tree");
TreeFileArtifact child1 = TreeFileArtifact.createTreeOutput(parent, "child1");
