Stop adding linking info to ObjcProvider in objc_common

PiperOrigin-RevId: 549133680
Change-Id: I36016634e72f5dc0eacf61d32c2b66437693d9ca

Author: googlewalt

src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchBinarySupport.java

@@ -648,8 +648,7 @@ private ObjcCommon common(
             .addDeps(propagatedDeps)
             .addCcLinkingContexts(additionalDepCcInfos)
             .addObjcProviders(additionalDepObjcProviders)
-            .setIntermediateArtifacts(intermediateArtifacts)
-            .setAlwayslink(false);
+            .setIntermediateArtifacts(intermediateArtifacts);
 
     return commonBuilder.build();
   }

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java

@@ -14,21 +14,13 @@
 
 package com.google.devtools.build.lib.rules.objc;
 
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.CC_LIBRARY;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.FORCE_LOAD_LIBRARY;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.IMPORTED_LIBRARY;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.J2OBJC_LIBRARY;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.LIBRARY;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.MODULE_MAP;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_DYLIB;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SDK_FRAMEWORK;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.SOURCE;
 import static com.google.devtools.build.lib.rules.objc.ObjcProvider.UMBRELLA_HEADER;
-import static com.google.devtools.build.lib.rules.objc.ObjcProvider.WEAK_SDK_FRAMEWORK;
 import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.HEADERS;
 import static com.google.devtools.build.lib.rules.objc.ObjcRuleClasses.OBJECT_FILE_SOURCES;
 
-import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -39,15 +31,11 @@
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.config.BuildConfigurationValue;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
-import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
-import com.google.devtools.build.lib.packages.BuiltinProvider;
-import com.google.devtools.build.lib.packages.Info;
 import com.google.devtools.build.lib.rules.apple.AppleToolchain;
 import com.google.devtools.build.lib.rules.cpp.CcCompilationContext;
 import com.google.devtools.build.lib.rules.cpp.CcInfo;
 import com.google.devtools.build.lib.rules.cpp.CcLinkingContext;
 import com.google.devtools.build.lib.rules.cpp.CppModuleMap;
-import com.google.devtools.build.lib.rules.cpp.LibraryToLink;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -100,18 +88,12 @@ static class Builder {
     private Iterable<ObjcProvider> objcProviders = ImmutableList.of();
     private Iterable<PathFragment> includes = ImmutableList.of();
     private IntermediateArtifacts intermediateArtifacts;
-    private boolean alwayslink;
     private boolean hasModuleMap;
-    private Iterable<Artifact> extraImportLibraries = ImmutableList.of();
     private final List<CcCompilationContext> ccCompilationContexts = new ArrayList<>();
     private final List<CcLinkingContext> ccLinkingContexts = new ArrayList<>();
     private final List<CcCompilationContext> directCCompilationContexts = new ArrayList<>();
     private final List<CcCompilationContext> implementationCcCompilationContexts =
         new ArrayList<>();
-    // List of CcLinkingContext to be merged into ObjcProvider, to be done for deps that don't have
-    // ObjcProviders.
-    // TODO(b/171413861): remove after objc link info migration.
-    private final List<CcLinkingContext> ccLinkingContextsForMerging = new ArrayList<>();
 
     private static final ImmutableSet<String> J2OBJC_SUPPORTED_RULES =
         ImmutableSet.of("java_import", "java_library", "java_proto_library", "proto_library");
@@ -198,15 +180,14 @@ Builder addDeps(List<? extends TransitiveInfoCollection> deps) {
       ImmutableList.Builder<CcInfo> ccInfos = ImmutableList.builder();
 
       for (TransitiveInfoCollection dep : deps) {
-        if (dep.get(ObjcProvider.STARLARK_CONSTRUCTOR) != null) {
-          addAnyProviders(objcProviders, dep, ObjcProvider.STARLARK_CONSTRUCTOR);
-        } else {
-          // We only use CcInfo's linking info if there is no ObjcProvider.  This is required so
-          // that objc_library archives do not get treated as if they are from cc targets.
-          addAnyContexts(
-              ccLinkingContextsForMerging, dep, CcInfo.PROVIDER, CcInfo::getCcLinkingContext);
+        ObjcProvider objcProvider = dep.get(ObjcProvider.STARLARK_CONSTRUCTOR);
+        if (objcProvider != null) {
+          objcProviders.add(objcProvider);
+        }
+        CcInfo ccInfo = dep.get(CcInfo.PROVIDER);
+        if (ccInfo != null) {
+          ccInfos.add(ccInfo);
         }
-        addAnyProviders(ccInfos, dep, CcInfo.PROVIDER);
       }
 
       addObjcProviders(objcProviders.build());
@@ -215,31 +196,6 @@ Builder addDeps(List<? extends TransitiveInfoCollection> deps) {
       return this;
     }
 
-    @CanIgnoreReturnValue
-    private static <T extends Info> ImmutableList.Builder<T> addAnyProviders(
-        ImmutableList.Builder<T> listBuilder,
-        TransitiveInfoCollection collection,
-        BuiltinProvider<T> providerClass) {
-      T provider = collection.get(providerClass);
-      if (provider != null) {
-        listBuilder.add(provider);
-      }
-      return listBuilder;
-    }
-
-    @CanIgnoreReturnValue
-    private static <T extends Info, U> List<U> addAnyContexts(
-        List<U> list,
-        TransitiveInfoCollection collection,
-        BuiltinProvider<T> providerClass,
-        Function<T, U> getContext) {
-      T provider = collection.get(providerClass);
-      if (provider != null) {
-        list.add(getContext.apply(provider));
-      }
-      return list;
-    }
-
     /**
      * Add providers which will be exposed both to the declaring rule and to any dependers on the
      * declaring rule.
@@ -272,12 +228,6 @@ Builder setIntermediateArtifacts(IntermediateArtifacts intermediateArtifacts) {
       return this;
     }
 
-    @CanIgnoreReturnValue
-    Builder setAlwayslink(boolean alwayslink) {
-      this.alwayslink = alwayslink;
-      return this;
-    }
-
     /**
      * Specifies that this target has a clang module map. This should be called if this target
      * compiles sources or exposes headers for other targets to use. Note that this does not add the
@@ -299,16 +249,13 @@ ObjcCommon build() {
           ImmutableList.copyOf(this.directCCompilationContexts);
       ImmutableList<CcCompilationContext> implementationCcCompilationContexts =
           ImmutableList.copyOf(this.implementationCcCompilationContexts);
-      ImmutableList<CcLinkingContext> ccLinkingContextsForMerging =
-          ImmutableList.copyOf(this.ccLinkingContextsForMerging);
 
       ObjcCompilationContext.Builder objcCompilationContextBuilder =
           ObjcCompilationContext.builder();
 
       ObjcProvider.Builder objcProvider = new ObjcProvider.Builder();
 
       objcProvider
-          .addAll(IMPORTED_LIBRARY, extraImportLibraries)
           .addTransitiveAndPropagate(objcProviders);
 
       objcCompilationContextBuilder
@@ -320,24 +267,12 @@ ObjcCommon build() {
           .addCcCompilationContexts(ccCompilationContexts)
           .addImplementationCcCompilationContexts(implementationCcCompilationContexts);
 
-      for (CcLinkingContext ccLinkingContext : ccLinkingContextsForMerging) {
-        objcProvider.addTransitiveAndPropagate(
-            CC_LIBRARY,
-            NestedSetBuilder.<LibraryToLink>linkOrder()
-                .addTransitive(ccLinkingContext.getLibraries())
-                .build());
-      }
-
       if (compilationAttributes.isPresent()) {
         CompilationAttributes attributes = compilationAttributes.get();
         PathFragment usrIncludeDir = PathFragment.create(AppleToolchain.sdkDir() + "/usr/include/");
         Iterable<PathFragment> sdkIncludes =
             Iterables.transform(
                 attributes.sdkIncludes().toList(), (p) -> usrIncludeDir.getRelative(p));
-        objcProvider
-            .addAll(SDK_FRAMEWORK, attributes.sdkFrameworks())
-            .addAll(WEAK_SDK_FRAMEWORK, attributes.weakSdkFrameworks())
-            .addAll(SDK_DYLIB, attributes.sdkDylibs());
         objcCompilationContextBuilder
             .addPublicHeaders(filterFileset(attributes.hdrs().toList()))
             .addPublicTextualHeaders(filterFileset(attributes.textualHdrs().toList()))
@@ -356,7 +291,6 @@ ObjcCommon build() {
                 FileType.except(artifacts.getSrcs(), OBJECT_FILE_SOURCES),
                 artifacts.getNonArcSrcs());
         objcProvider
-            .addAll(LIBRARY, artifacts.getArchive().asSet())
             .addAll(SOURCE, allSources)
             .addAllDirect(SOURCE, allSources);
         objcCompilationContextBuilder.addPublicHeaders(
@@ -370,17 +304,6 @@ ObjcCommon build() {
         }
       }
 
-      if (alwayslink) {
-        for (CompilationArtifacts artifacts : compilationArtifacts.asSet()) {
-          for (Artifact archive : artifacts.getArchive().asSet()) {
-            objcProvider.add(FORCE_LOAD_LIBRARY, archive);
-          }
-        }
-        for (Artifact archive : extraImportLibraries) {
-          objcProvider.add(FORCE_LOAD_LIBRARY, archive);
-        }
-      }
-
       if (hasModuleMap) {
         CppModuleMap moduleMap = intermediateArtifacts.swiftModuleMap();
         Optional<Artifact> umbrellaHeader = moduleMap.getUmbrellaHeader();

src/main/starlark/builtins_bzl/common/objc/compilation_support.bzl

@@ -43,7 +43,6 @@ def _build_common_variables(
         implementation_deps = [],
         extra_disabled_features = [],
         extra_enabled_features = [],
-        extra_import_libraries = [],
         attr_linkopts = [],
         alwayslink = False,
         has_module_map = False,
@@ -66,9 +65,7 @@ def _build_common_variables(
         deps = deps,
         implementation_deps = implementation_deps,
         intermediate_artifacts = intermediate_artifacts,
-        alwayslink = alwayslink,
         has_module_map = has_module_map,
-        extra_import_libraries = extra_import_libraries,
         attr_linkopts = attr_linkopts,
         direct_cc_compilation_contexts = direct_cc_compilation_contexts,
     )

src/main/starlark/builtins_bzl/common/objc/j2objc_aspect.bzl

@@ -448,10 +448,8 @@ def _common(
         intermediate_artifacts = intermediate_artifacts,
         includes = header_search_paths,
         compilation_attributes = None,
-        extra_import_libraries = [],
         implementation_deps = [],
         attr_linkopts = [],
-        alwayslink = False,
         is_aspect = True,
     )