Don't re-write shared_libraries list

Summary:
We pass around the same list of shared_libraries in the forms
`list[(str, SharedLibrary, bool)]`
`list[SharedLibrary]`
`list[(SharedLibrary, str)]`
This diff moves everything to use `list[(SharedLibrary, str)]` to match the format used in `prelude/linking/shared_libraries.bzl::zip_shlibs`

Reviewed By: jtbraun

Differential Revision: D72982021

fbshipit-source-id: 97ead99a9f50fc2bb1a472aef53fb989e2fc2aa6

Author: BrandonTheBuilder

Diff for: prelude/python/linking/native.bzl

@@ -233,7 +233,7 @@ def _get_link_group_info(
     return (link_group_info, link_group_specs)
 
 def process_native_linking(ctx, deps, python_toolchain, extra, package_style, allow_cache_upload, extra_artifacts) -> (
-    list[(str, SharedLibrary)],
+    list[(SharedLibrary, str)],
     dict[str, (LinkedObject, Label)],
     list[LinkArgs],
 ):
@@ -369,12 +369,11 @@ def process_native_linking(ctx, deps, python_toolchain, extra, package_style, al
 
     # Put native libraries into the runtime location, as we need to unpack
     # potentially all of them before startup.
-    shared_libs = [("runtime/lib", s) for s in executable_info.shared_libs]
+    shared_libs = [(s, "runtime/lib") for s in executable_info.shared_libs]
 
     # TODO expect(len(executable_info.runtime_files) == 0, "OH NO THERE ARE RUNTIME FILES")
     extra_artifacts.update(extension_info_reduced.artifacts)
     shared_libs.append((
-        "runtime/bin",
         create_shlib(
             soname = ctx.attrs.executable_name,
             label = ctx.label,
@@ -384,6 +383,7 @@ def process_native_linking(ctx, deps, python_toolchain, extra, package_style, al
                 dwp = executable_info.dwp,
             ),
         ),
+        "runtime/bin",
     ))
 
     link_args = executable_info.link_args

Diff for: prelude/python/linking/omnibus.bzl

@@ -38,7 +38,7 @@ def process_omnibus_linking(
         extensions: dict[str, (LinkedObject, Label)],
         python_toolchain: PythonToolchainInfo,
         extra: dict[str, typing.Any]) -> (
-    list[(str, SharedLibrary)],
+    list[(SharedLibrary, str)],
     dict[str, (LinkedObject, Label)],
 ):
     # If we're using omnibus linking, re-link libraries and extensions and
@@ -78,7 +78,7 @@ def process_omnibus_linking(
         dest: (omnibus_libs.roots[label].shared_library, label)
         for dest, (_, label) in extensions.items()
     }
-    shared_libs = [("", shlib) for shlib in omnibus_libs.libraries]
+    shared_libs = [(shlib, "") for shlib in omnibus_libs.libraries]
 
     omnibus_providers = []
 

Diff for: prelude/python/make_py_package.bzl

@@ -186,7 +186,8 @@ def make_py_package(
         package_style: PackageStyle,
         build_args: list[ArgLike],
         pex_modules: PexModules,
-        shared_libraries: list[(str, SharedLibrary, bool)],
+        shared_libraries: list[(SharedLibrary, str)],
+        preload_labels: set[Label],
         main: EntryPoint,
         allow_cache_upload: bool,
         link_args: list[LinkArgs] = [],
@@ -216,13 +217,13 @@ def make_py_package(
         ctx = ctx,
         shared_libraries = [
             (shlib, libdir)
-            for libdir, shlib, preload in shared_libraries
-            if preload
+            for shlib, libdir in shared_libraries
+            if shlib.label in preload_labels
         ],
     )
 
     # Add link metadata to manifest_module_entries if requested.
-    manifest_module_entries = _add_dep_metadata_to_manifest_module(ctx, map(lambda s: s[1], shared_libraries), link_args)
+    manifest_module_entries = _add_dep_metadata_to_manifest_module(ctx, shared_libraries, link_args)
     generated_files = []
 
     startup_functions_loader = generate_startup_function_loader(ctx, manifest_module_entries)
@@ -244,7 +245,7 @@ def make_py_package(
         ctx,
         pex_modules,
         [startup_function] if startup_function else [],
-        [(shlib, libdir) for libdir, shlib, _ in shared_libraries],
+        shared_libraries,
         debuginfo_files = debuginfo_files,
     )
 
@@ -254,7 +255,7 @@ def make_py_package(
         make_py_package_cmd,
         package_style,
         build_args,
-        map(lambda s: (s[1], s[0]), shared_libraries),
+        shared_libraries,
         generated_files,
         preload_libraries,
         common_modules_args,
@@ -284,7 +285,7 @@ def make_py_package(
             ctx,
             repl_pex_modules,
             [startup_function] if startup_function else [],
-            [(shlib, libdir) for libdir, shlib, _ in shared_libraries],
+            shared_libraries,
             debuginfo_files = debuginfo_files,
             suffix = "_repl",
         )
@@ -296,7 +297,7 @@ def make_py_package(
                 make_py_package_cmd,
                 PackageStyle("inplace"),
                 build_args,
-                map(lambda s: (s[1], s[0]), shared_libraries),
+                shared_libraries,
                 generated_files,
                 preload_libraries,
                 repl_common_modules_args,
@@ -317,7 +318,7 @@ def make_py_package(
             make_py_package_cmd,
             PackageStyle(style),
             build_args,
-            map(lambda s: (s[1], s[0]), shared_libraries),
+            shared_libraries,
             generated_files,
             preload_libraries,
             common_modules_args,
@@ -993,7 +994,7 @@ def _hidden_resources_error_message(current_target: Label, hidden_resources: lis
 
 def _get_shared_library_dep_metadata(
         ctx: AnalysisContext,
-        shared_libraries: list[SharedLibrary],
+        shared_libraries: list[(SharedLibrary, str)],
         link_args: list[LinkArgs]) -> list[DepMetadata]:
     """
     Dedupes the linker metadata for each shared library into a single string.
@@ -1015,7 +1016,7 @@ def _get_shared_library_dep_metadata(
     for args in link_args:
         add_inner_infos(args)
 
-    for lib in shared_libraries:
+    for lib, _ in shared_libraries:
         # Note: refer to SharedLibrary.LinkedObject.link_args here. SharedLibrary.link_args isn't
         # always populated.
         for args in lib.lib.link_args or []:
@@ -1033,7 +1034,7 @@ def _get_shared_library_dep_metadata(
 
 def _add_dep_metadata_to_manifest_module(
         ctx: AnalysisContext,
-        shared_libraries: list[SharedLibrary],
+        shared_libraries: list[(SharedLibrary, str)],
         link_args: list[LinkArgs]) -> dict[str, typing.Any] | None:
     """
     Updates manifest_module_entries with link metadata if they exist.

Diff for: prelude/python/python_binary.bzl

@@ -256,7 +256,7 @@ def _convert_python_library_to_executable(
     package_style = get_package_style(ctx)
 
     # Convert preloaded deps to a set of their names to be loaded by.
-    preload_labels = {_linkable_graph(d).label: None for d in ctx.attrs.preload_deps if _linkable_graph(d)}
+    preload_labels = set([_linkable_graph(d).label for d in ctx.attrs.preload_deps if _linkable_graph(d)])
 
     extra_artifacts = {}
     link_args = []
@@ -284,14 +284,14 @@ def _convert_python_library_to_executable(
             shared_libs, extensions = process_omnibus_linking(ctx, deps, extensions, python_toolchain, extra)
         else:
             shared_libs = [
-                ("", shared_lib)
+                (shared_lib, "")
                 for shared_lib in traverse_shared_library_info(library.shared_libraries)
             ]
 
             # darwin and windows expect self-contained dynamically linked
             # python extensions without additional transitive shared libraries
             shared_libs += [
-                ("", extension_shared_lib)
+                (extension_shared_lib, "")
                 for extension_shared_lib in traverse_shared_library_info(library.extension_shared_libraries)
             ]
 
@@ -318,22 +318,13 @@ def _convert_python_library_to_executable(
 
     extra_manifests = create_manifest_for_source_map(ctx, "extra_manifests", extra_artifacts)
 
-    # Create the map of native libraries to their artifacts and whether they
-    # need to be preloaded.  Note that we merge preload deps into regular deps
-    # above, before gathering up all native libraries, so we're guaranteed to
-    # have all preload libraries (and their transitive deps) here.
-    shared_libs = [
-        (libdir, shlib, shlib.label in preload_labels)
-        for libdir, shlib in shared_libs
-    ]
-
     # Strip native libraries and extensions and update the .gnu_debuglink references if we are extracting
     # debug symbols from the par
     debuginfo_files = []
     debuginfos = {}
     if ctx.attrs.strip_libpar == "extract" and package_style == PackageStyle("standalone") and cxx_is_gnu(ctx):
         stripped_shlibs = []
-        for libdir, shlib, preload in shared_libs:
+        for shlib, libdir in shared_libs:
             name = paths.join(
                 libdir,
                 value_or(
@@ -360,7 +351,7 @@ def _convert_python_library_to_executable(
                     dwp = shlib.lib.dwp,
                 ),
             )
-            stripped_shlibs.append((libdir, shlib, preload))
+            stripped_shlibs.append((shlib, libdir))
             debuginfo_files.append(((libdir, shlib, ".debuginfo"), debuginfo))
         shared_libs = stripped_shlibs
         for name, (extension, label) in extensions.items():
@@ -400,6 +391,7 @@ def _convert_python_library_to_executable(
         build_args = build_args,
         pex_modules = pex_modules,
         shared_libraries = shared_libs,
+        preload_labels = preload_labels,
         main = main,
         allow_cache_upload = allow_cache_upload,
         debuginfo_files = debuginfo_files,