Remove preloaded_deps attribute from cc_shared_library

This attribute came out of the design doc for cc_shared_library for a use case
that hasn't materialized. Adding this attribute later would be a compatible
change. If/when a use case does materialize we can easily add it back and fix
any problems with it then.

From a search across many different repositories, it looks like no one has ever
used the attribute.

RELNOTES:none
PiperOrigin-RevId: 510419035
Change-Id: I569d631ad78a78312e348913325438aa7f0256dc

Author: oquenchil

src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl

@@ -15,7 +15,7 @@
 """cc_binary Starlark implementation replacing native"""
 
 load(":common/cc/semantics.bzl", "semantics")
-load(":common/cc/experimental_cc_shared_library.bzl", "CcSharedLibraryInfo", "GraphNodeInfo", "build_exports_map_from_only_dynamic_deps", "build_link_once_static_libs_map", "merge_cc_shared_library_infos", "throw_linked_but_not_exported_errors")
+load(":common/cc/experimental_cc_shared_library.bzl", "GraphNodeInfo", "build_exports_map_from_only_dynamic_deps", "build_link_once_static_libs_map", "merge_cc_shared_library_infos", "throw_linked_but_not_exported_errors")
 load(":common/cc/cc_helper.bzl", "cc_helper", "linker_mode")
 load(":common/cc/cc_info.bzl", "CcInfo")
 
@@ -352,19 +352,8 @@ def _separate_static_and_dynamic_link_libraries(direct_children, can_be_linked_d
             all_children.extend(node.children)
     return (link_statically_labels, link_dynamically_labels)
 
-def _get_preloaded_deps_from_dynamic_deps(ctx):
-    cc_infos = []
-    for dep in ctx.attr.dynamic_deps:
-        cc_shared_library_info = dep[CcSharedLibraryInfo]
-        preloaded_deps_field = cc_shared_library_info.preloaded_deps
-        if preloaded_deps_field != None:
-            cc_infos.append(preloaded_deps_field)
-
-    return cc_common.merge_cc_infos(direct_cc_infos = cc_infos, cc_infos = cc_infos).linking_context.linker_inputs.to_list()
-
 def _filter_libraries_that_are_linked_dynamically(ctx, cc_linking_context, cpp_config):
     merged_cc_shared_library_infos = merge_cc_shared_library_infos(ctx)
-    preloaded_deps = _get_preloaded_deps_from_dynamic_deps(ctx)
     link_once_static_libs_map = build_link_once_static_libs_map(merged_cc_shared_library_infos)
     exports_map = build_exports_map_from_only_dynamic_deps(merged_cc_shared_library_infos)
     static_linker_inputs = []
@@ -400,16 +389,15 @@ def _filter_libraries_that_are_linked_dynamically(ctx, cc_linking_context, cpp_c
     rule_impl_debug_files = None
     if cpp_config.experimental_cc_shared_library_debug():
         debug_linker_inputs_file = ["Owner: " + str(ctx.label)]
-        static_linker_inputs_and_preloaded_deps = static_linker_inputs + preloaded_deps
-        for linker_input in static_linker_inputs_and_preloaded_deps:
+        for linker_input in static_linker_inputs:
             debug_linker_inputs_file.append(str(linker_input.owner))
         link_once_static_libs_debug_file = ctx.actions.declare_file(ctx.label.name + "_link_once_static_libs.txt")
         ctx.actions.write(link_once_static_libs_debug_file, "\n".join(debug_linker_inputs_file), False)
         transitive_debug_files_list = []
         for dep in ctx.attr.dynamic_deps:
             transitive_debug_files_list.append(dep[OutputGroupInfo].rule_impl_debug_files)
         rule_impl_debug_files = depset([link_once_static_libs_debug_file], transitive = transitive_debug_files_list)
-    return (cc_common.create_linking_context(linker_inputs = depset(exports_map.values() + static_linker_inputs + preloaded_deps, order = "topological")), rule_impl_debug_files)
+    return (cc_common.create_linking_context(linker_inputs = depset(exports_map.values() + static_linker_inputs, order = "topological")), rule_impl_debug_files)
 
 def _create_transitive_linking_actions(
         ctx,

src/main/starlark/builtins_bzl/common/cc/experimental_cc_shared_library.bzl

@@ -68,18 +68,14 @@ CcSharedLibraryInfo = provider(
                                  "initializers. If we try to link them more than once, " +
                                  "we will throw an error",
         "linker_input": "the resulting linker input artifact for the shared library",
-        "preloaded_deps": "cc_libraries needed by this cc_shared_library that should" +
-                          " be linked the binary. If this is set, this cc_shared_library has to " +
-                          " be a direct dependency of the cc_binary",
     },
 )
 
 # For each target, find out whether it should be linked statically or
 # dynamically.
 def _separate_static_and_dynamic_link_libraries(
         direct_children,
-        can_be_linked_dynamically,
-        preloaded_deps_direct_labels):
+        can_be_linked_dynamically):
     node = None
     all_children = list(direct_children)
     targets_to_be_linked_statically_map = {}
@@ -101,7 +97,7 @@ def _separate_static_and_dynamic_link_libraries(
 
         if node_label in can_be_linked_dynamically:
             targets_to_be_linked_dynamically_set[node_label] = True
-        elif node_label not in preloaded_deps_direct_labels:
+        else:
             targets_to_be_linked_statically_map[node_label] = node.linkable_more_than_once
             all_children.extend(node.children)
 
@@ -116,11 +112,6 @@ def _merge_cc_shared_library_infos(ctx):
     dynamic_deps = []
     transitive_dynamic_deps = []
     for dep in ctx.attr.dynamic_deps:
-        # This error is not relevant for cc_binary.
-        if not hasattr(ctx.attr, "_cc_binary") and dep[CcSharedLibraryInfo].preloaded_deps != None:
-            fail("{} can only be a direct dependency of a " +
-                 " cc_binary because it has " +
-                 "preloaded_deps".format(str(dep.label)))
         dynamic_dep_entry = (
             dep[CcSharedLibraryInfo].exports,
             dep[CcSharedLibraryInfo].linker_input,
@@ -254,7 +245,6 @@ def _filter_inputs(
         cc_toolchain,
         deps,
         transitive_exports,
-        preloaded_deps_direct_labels,
         link_once_static_libs_map):
     linker_inputs = []
     curr_link_once_static_libs_set = {}
@@ -278,7 +268,6 @@ def _filter_inputs(
     (targets_to_be_linked_statically_map, targets_to_be_linked_dynamically_set) = _separate_static_and_dynamic_link_libraries(
         graph_structure_aspect_nodes,
         can_be_linked_dynamically,
-        preloaded_deps_direct_labels,
     )
 
     # We keep track of precompiled_only_dynamic_libraries, so that we can add
@@ -473,16 +462,6 @@ def _cc_shared_library_impl(ctx):
 
         _check_if_target_should_be_exported_without_filter(export.label, ctx.label, _get_permissions(ctx))
 
-    preloaded_deps_direct_labels = {}
-    preloaded_dep_merged_cc_info = None
-    if len(ctx.attr.preloaded_deps) != 0:
-        preloaded_deps_cc_infos = []
-        for preloaded_dep in ctx.attr.preloaded_deps:
-            preloaded_deps_direct_labels[str(preloaded_dep.label)] = True
-            preloaded_deps_cc_infos.append(preloaded_dep[CcInfo])
-
-        preloaded_dep_merged_cc_info = cc_common.merge_cc_infos(cc_infos = preloaded_deps_cc_infos)
-
     link_once_static_libs_map = _build_link_once_static_libs_map(merged_cc_shared_library_info)
 
     (exports, linker_inputs, curr_link_once_static_libs_set, precompiled_only_dynamic_libraries) = _filter_inputs(
@@ -491,7 +470,6 @@ def _cc_shared_library_impl(ctx):
         cc_toolchain,
         deps,
         exports_map,
-        preloaded_deps_direct_labels,
         link_once_static_libs_map,
     )
 
@@ -620,7 +598,6 @@ def _cc_shared_library_impl(ctx):
                 owner = ctx.label,
                 libraries = depset([linking_outputs.library_to_link] + precompiled_only_dynamic_libraries),
             ),
-            preloaded_deps = preloaded_dep_merged_cc_info,
         ),
     ]
 
@@ -692,7 +669,6 @@ cc_shared_library = rule(
         "dynamic_deps": attr.label_list(providers = [CcSharedLibraryInfo]),
         "exports_filter": attr.string_list(),
         "permissions": attr.label_list(providers = [CcSharedLibraryPermissionsInfo]),
-        "preloaded_deps": attr.label_list(providers = [CcInfo]),
         "win_def_file": attr.label(allow_single_file = [".def"]),
         "roots": attr.label_list(providers = [CcInfo], aspects = [graph_structure_aspect]),
         "deps": attr.label_list(providers = [CcInfo], aspects = [graph_structure_aspect]),

src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/BUILD.builtin_test

@@ -109,7 +109,6 @@ cc_shared_library(
         "//src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3:diff_pkg_so"
     ],
     features = ["windows_export_all_symbols"],
-    preloaded_deps = ["preloaded_dep"],
     deps = [
         "baz",
         "foo",
@@ -125,12 +124,6 @@ cc_shared_library(
     }),
 )
 
-cc_library(
-    name = "preloaded_dep",
-    srcs = ["preloaded_dep.cc"],
-    hdrs = ["preloaded_dep.h"],
-)
-
 cc_library(
     name = "foo",
     srcs = [
@@ -146,7 +139,6 @@ cc_library(
         "//conditions:default": [],
     }),
     deps = [
-        "preloaded_dep",
         "bar",
         "baz",
         # Not exported.

src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/cc_shared_library_integration_test.sh

@@ -42,8 +42,6 @@ function test_shared_library_symbols() {
   check_symbol_present "$symbols" "U _Z3barv"
   check_symbol_present "$symbols" "T _Z3bazv"
   check_symbol_present "$symbols" "T _Z3foov"
-  # Check that the preloaded dep symbol is not present
-  check_symbol_present "$symbols" "U _Z13preloaded_depv"
 
   check_symbol_absent "$symbols" "_Z3quxv"
   check_symbol_absent "$symbols" "_Z4bar3v"
@@ -66,14 +64,11 @@ function do_test_binary() {
 function test_binary() {
   binary=$(find . -name binary)
   do_test_binary $binary
-  check_symbol_present "$symbols" "T _Z13preloaded_depv"
 }
 
 function test_cc_test() {
   cc_test=$(find . -name cc_test)
   do_test_binary $cc_test
-  check_symbol_absent "$symbols" "_Z13preloaded_depv"
-  $LDD_BINARY $cc_test | (grep -q "preloaded_Udep.so" || (echo "Expected '"preloaded_Udep.so"'" && exit 1))
 }
 
 test_shared_library_user_link_flags

src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/foo.cc

@@ -15,7 +15,6 @@
 #include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/baz.h"
 #include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib.h"
 #include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/direct_so_file_cc_lib2.h"
-#include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/preloaded_dep.h"
 #include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library/qux.h"
 #include "src/main/starlark/tests/builtins_bzl/cc/cc_shared_library/test_cc_shared_library3/diff_pkg.h"
 
@@ -27,7 +26,6 @@ int foo() {
 #ifdef IS_LINUX
   direct_so_file_cc_lib();
   direct_so_file_cc_lib2();
-  preloaded_dep();
 #endif
   return 42;
 }