Automated rollback of commit 22d1ef7f866e74d8d1f1d322ce072150b00ca3f0.
*** Reason for rollback ***
Breaks nightly TGP.
PiperOrigin-RevId: 270960700
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index a44b5a0..a7ca9a8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -451,14 +451,6 @@
}
/**
- * Returns true if a provider matching the given provider key has already been added to the
- * configured target builder.
- */
- public boolean containsProviderKey(Provider.Key providerKey) {
- return providersBuilder.contains(providerKey);
- }
-
- /**
* Add a Skylark transitive info. The provider value must be safe.
*/
public RuleConfiguredTargetBuilder addSkylarkTransitiveInfo(
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
index f998c51..a996750 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleConfiguredTargetUtil.java
@@ -413,8 +413,7 @@
StructImpl insStruct = cast("instrumented_files", oldStyleProviders, StructImpl.class, loc);
addInstrumentedFiles(insStruct, context.getRuleContext(), builder);
} else if (isNativeDeclaredProviderWithLegacySkylarkName(oldStyleProviders.getValue(field))) {
- addNativeDeclaredProviderWithLegacySkylarkName(
- (InfoInterface) oldStyleProviders.getValue(field), field, builder, loc);
+ builder.addNativeDeclaredProvider((InfoInterface) oldStyleProviders.getValue(field));
} else if (!field.equals("providers")) {
// We handled providers already.
builder.addSkylarkTransitiveInfo(field, oldStyleProviders.getValue(field), loc);
@@ -422,33 +421,6 @@
}
}
- @SuppressWarnings("deprecation") // For legacy migrations
- private static void addNativeDeclaredProviderWithLegacySkylarkName(
- InfoInterface provider, String field, RuleConfiguredTargetBuilder builder, Location loc)
- throws EvalException {
-
- // For legacy reasons, if the provider is specified using a struct field name which
- // does not match the provider key:
- // 1. It must be added under the specified key.
- // 2. It must be added under the legacy provider key *only if* there is not already
- // a provider registered under that key.
- // (This mechanism is heavily deprecated and being removed with
- // --incompatible_disallow_struct_provider_syntax)
- if (provider.getProvider() instanceof NativeProvider.WithLegacySkylarkName) {
- NativeProvider.WithLegacySkylarkName legacyProvider =
- (NativeProvider.WithLegacySkylarkName) provider.getProvider();
- if (!field.equals(legacyProvider.getSkylarkName())) {
- builder.addSkylarkTransitiveInfo(field, provider, loc);
- if (!builder.containsProviderKey(provider.getProvider().getKey())) {
- builder.addNativeDeclaredProvider(provider);
- }
- return;
- }
- }
-
- builder.addNativeDeclaredProvider(provider);
- }
-
/**
* Returns the provider key from an info object.
*
