Skip to content

Commit c18e6d5

Browse files
gregestrencopybara-github
authored andcommitted
Remove HostTransition.
Also remove various unused BUILD deps caught by static analysis. PiperOrigin-RevId: 499583261 Change-Id: Ifd22bd21804233a891c4a5849ad02c897ab84ae6
1 parent e8b8e10 commit c18e6d5

12 files changed

Lines changed: 8 additions & 186 deletions

File tree

src/main/java/com/google/devtools/build/lib/analysis/BUILD

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ java_library(
6464
":config/execution_transition_factory",
6565
":config/fragment",
6666
":config/fragment_options",
67-
":config/host_transition",
6867
":config/invalid_configuration_exception",
6968
":config/per_label_options",
7069
":config/run_under",
@@ -286,14 +285,12 @@ java_library(
286285
":config/build_options",
287286
":config/config_conditions",
288287
":config/config_matching_provider",
289-
":config/core_option_converters",
290288
":config/core_options",
291289
":config/execution_transition_factory",
292290
":config/fragment",
293291
":config/fragment_class_set",
294292
":config/fragment_options",
295293
":config/fragment_registry",
296-
":config/host_transition",
297294
":config/invalid_configuration_exception",
298295
":config/per_label_options",
299296
":config/run_under",
@@ -386,7 +383,6 @@ java_library(
386383
"//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
387384
"//src/main/java/com/google/devtools/build/lib/actions:package_roots",
388385
"//src/main/java/com/google/devtools/build/lib/analysis/platform",
389-
"//src/main/java/com/google/devtools/build/lib/analysis/starlark/annotations",
390386
"//src/main/java/com/google/devtools/build/lib/analysis/stringtemplate",
391387
"//src/main/java/com/google/devtools/build/lib/bugreport",
392388
"//src/main/java/com/google/devtools/build/lib/buildeventstream",
@@ -1680,10 +1676,7 @@ java_library(
16801676
name = "config/config_aware_aspect_builder",
16811677
srcs = ["config/ConfigAwareAspectBuilder.java"],
16821678
deps = [
1683-
":config/fragment",
1684-
":config/host_transition",
16851679
"//src/main/java/com/google/devtools/build/lib/packages",
1686-
"//third_party:error_prone_annotations",
16871680
],
16881681
)
16891682

@@ -1833,23 +1826,6 @@ java_library(
18331826
],
18341827
)
18351828

1836-
java_library(
1837-
name = "config/host_transition",
1838-
srcs = ["config/HostTransition.java"],
1839-
deps = [
1840-
":config/build_options",
1841-
":config/core_options",
1842-
":config/fragment_options",
1843-
":config/transitions/patch_transition",
1844-
":config/transitions/transition_factory",
1845-
"//src/main/java/com/google/devtools/build/lib/events",
1846-
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec",
1847-
"//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant",
1848-
"//third_party:auto_value",
1849-
"//third_party:guava",
1850-
],
1851-
)
1852-
18531829
java_library(
18541830
name = "config/invalid_configuration_exception",
18551831
srcs = ["config/InvalidConfigurationException.java"],
@@ -1928,7 +1904,6 @@ java_library(
19281904
name = "config/transition_factories",
19291905
srcs = ["config/TransitionFactories.java"],
19301906
deps = [
1931-
":config/host_transition",
19321907
":config/transitions/configuration_transition",
19331908
":config/transitions/no_transition",
19341909
":config/transitions/null_transition",

src/main/java/com/google/devtools/build/lib/analysis/config/HostTransition.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

src/main/java/com/google/devtools/build/lib/analysis/config/TransitionFactories.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@
2121
import com.google.devtools.build.lib.analysis.config.transitions.TransitionFactory;
2222

2323
/** Useful implementations of {@link TransitionFactory}. */
24-
// This class is in lib.analysis.config in order to access HostTransition, which is not visible to
25-
// lib.analysis.config.transitions.
24+
// This class is in lib.analysis.config in order to access the now removed HostTransition, which
25+
// is not visible to lib.analysis.config.transitions.
26+
// TODO(b/253313672): move this to lib.analysis.config.transitions.
2627
public final class TransitionFactories {
2728
// Don't instantiate this class.
2829
private TransitionFactories() {}
2930

3031
/** Returns a {@link TransitionFactory} that wraps a static transition. */
3132
public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
3233
ConfigurationTransition transition) {
33-
if (transition instanceof HostTransition) {
34-
return HostTransition.createFactory();
35-
} else if (transition instanceof NoTransition) {
34+
if (transition instanceof NoTransition) {
3635
return NoTransition.createFactory();
3736
} else if (transition instanceof NullTransition) {
3837
return NullTransition.createFactory();

src/main/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactory.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public abstract class ComposingTransitionFactory<T extends TransitionFactory.Dat
3737
* {@code fromOptions -> transition1 -> transition2 -> toOptions }.
3838
*
3939
* <p>Note that this method checks for transition factories that cannot be composed, such as if
40-
* one of the transitions is {@link NoTransition} or the host transition, and returns an
41-
* efficiently composed transition.
40+
* one of the transitions is {@link NoTransition}, and returns an efficiently composed transition.
4241
*/
4342
public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
4443
TransitionFactory<T> transitionFactory1, TransitionFactory<T> transitionFactory2) {
@@ -64,9 +63,8 @@ public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
6463
// Since transitionFactory2 causes no changes, use transitionFactory1 directly.
6564
return transitionFactory1;
6665
} else if (isFinal(transitionFactory2)) {
67-
// When the second transition is null or a HOST transition, there's no need to compose. But
68-
// this also
69-
// improves performance: host transitions are common, and ConfiguredTargetFunction has special
66+
// When the second transition is null there's no need to compose. But this also improves
67+
// performance: host transitions are common, and ConfiguredTargetFunction has special
7068
// optimized logic to handle them. If they were buried in the last segment of a
7169
// ComposingTransition, those optimizations wouldn't trigger.
7270
return transitionFactory2;
@@ -77,7 +75,7 @@ public static <T extends TransitionFactory.Data> TransitionFactory<T> of(
7775

7876
private static <T extends TransitionFactory.Data> boolean isFinal(
7977
TransitionFactory<T> transitionFactory) {
80-
return NullTransition.isInstance(transitionFactory) || transitionFactory.isHost();
78+
return NullTransition.isInstance(transitionFactory);
8179
}
8280

8381
private static <T extends TransitionFactory.Data> TransitionFactory<T> create(
@@ -96,11 +94,6 @@ public ConfigurationTransition create(T data) {
9694

9795
abstract TransitionFactory<T> transitionFactory2();
9896

99-
@Override
100-
public boolean isHost() {
101-
return transitionFactory1().isHost() || transitionFactory2().isHost();
102-
}
103-
10497
@Override
10598
public boolean isTool() {
10699
return transitionFactory1().isTool() || transitionFactory2().isTool();

src/main/java/com/google/devtools/build/lib/analysis/config/transitions/NoConfigTransition.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ public PatchTransition create(T unused) {
9191
return INSTANCE;
9292
}
9393

94-
@Override
95-
public boolean isHost() {
96-
return true;
97-
}
98-
9994
@Override
10095
public boolean isTool() {
10196
return true;

src/main/java/com/google/devtools/build/lib/analysis/config/transitions/TransitionFactory.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,12 @@ default TransitionType transitionType() {
6363

6464
// TODO(https://github.com/bazelbuild/bazel/issues/7814): Once everything uses TransitionFactory,
6565
// remove these methods.
66-
/** Returns {@code true} if the result of this {@link TransitionFactory} is a host transition. */
67-
default boolean isHost() {
68-
return false;
69-
}
7066

7167
/**
7268
* Returns {@code true} if the result of this {@link TransitionFactory} should be considered as
7369
* part of the tooling rather than a dependency of the original target.
7470
*/
7571
default boolean isTool() {
76-
if (isHost()) {
77-
// Every host dependency is also a tool dependency.
78-
return true;
79-
}
80-
8172
return false;
8273
}
8374

src/main/java/com/google/devtools/build/lib/runtime/commands/info/BuildLanguageInfoItem.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ private static byte[] getBuildLanguageDefinition(RuleClassProvider provider) {
8787
attrPb.setAllowEmpty(!attr.isNonEmpty());
8888
attrPb.setAllowSingleFile(attr.isSingleArtifact());
8989
attrPb.setConfigurable(attr.isConfigurable());
90-
attrPb.setCfgIsHost(attr.getTransitionFactory().isHost());
9190

9291
// Encode default value, if simple.
9392
Object v = attr.getDefaultValueUnchecked();

src/main/java/com/google/devtools/build/lib/skyframe/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ java_library(
247247
"//src/main/java/com/google/devtools/build/lib/analysis:config/core_options",
248248
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_factory",
249249
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_options",
250-
"//src/main/java/com/google/devtools/build/lib/analysis:config/host_transition",
251250
"//src/main/java/com/google/devtools/build/lib/analysis:config/invalid_configuration_exception",
252251
"//src/main/java/com/google/devtools/build/lib/analysis:config/optioninfo",
253252
"//src/main/java/com/google/devtools/build/lib/analysis:config/starlark_defined_config_transition",

src/test/java/com/google/devtools/build/lib/analysis/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ java_library(
7979
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment",
8080
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_options",
8181
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_registry",
82-
"//src/main/java/com/google/devtools/build/lib/analysis:config/host_transition",
8382
"//src/main/java/com/google/devtools/build/lib/analysis:config/per_label_options",
8483
"//src/main/java/com/google/devtools/build/lib/analysis:config/run_under",
8584
"//src/main/java/com/google/devtools/build/lib/analysis:config/run_under_converter",

src/test/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactoryTest.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.google.common.collect.Iterables;
2323
import com.google.devtools.build.lib.analysis.config.BuildOptions;
2424
import com.google.devtools.build.lib.analysis.config.BuildOptionsView;
25-
import com.google.devtools.build.lib.analysis.config.HostTransition;
2625
import com.google.devtools.build.lib.analysis.config.TransitionFactories;
2726
import com.google.devtools.build.lib.cmdline.Label;
2827
import com.google.devtools.build.lib.events.EventHandler;
@@ -138,28 +137,6 @@ public void compose_split_split() {
138137
TransitionFactories.of(new StubSplit(FLAG_2, "value2a", "value2b"))));
139138
}
140139

141-
@Test
142-
public void compose_host_first() {
143-
TransitionFactory<StubData> composed =
144-
ComposingTransitionFactory.of(
145-
HostTransition.createFactory(),
146-
TransitionFactories.of(new StubPatch(FLAG_1, "value2")));
147-
148-
assertThat(composed).isNotNull();
149-
assertThat(composed.isHost()).isTrue();
150-
}
151-
152-
@Test
153-
public void compose_host_second() {
154-
TransitionFactory<StubData> composed =
155-
ComposingTransitionFactory.of(
156-
TransitionFactories.of(new StubPatch(FLAG_1, "value2")),
157-
HostTransition.createFactory());
158-
159-
assertThat(composed).isNotNull();
160-
assertThat(composed.isHost()).isTrue();
161-
}
162-
163140
@Test
164141
public void compose_noTrans_first() {
165142
TransitionFactory<StubData> patch = TransitionFactories.of(new StubPatch(FLAG_1, "value"));

0 commit comments

Comments
 (0)