Revert "Migrate to the modern Starlark linker input API. (#512)"

This reverts commit aff1754.

Author: keith

swift/internal/linking.bzl

@@ -95,21 +95,17 @@ def _register_static_library_link_action(
     )
 
 def register_libraries_to_link(
-        owning_label,
         actions,
         alwayslink,
         cc_feature_configuration,
         is_dynamic,
         is_static,
         library_name,
         objects,
-        swift_toolchain,
-        user_link_flags,
-        additional_inputs):
+        swift_toolchain):
     """Declares the requested libraries and registers actions to link them.
 
     Args:
-        owning_label: Label executing rule (i.e., ctx.label).
         actions: The object used to register actions.
         alwayslink: If True, create a static library that should be
             always-linked (having a `.lo` extension instead of `.a`). This
@@ -124,11 +120,9 @@ def register_libraries_to_link(
             linked.
         swift_toolchain: The Swift toolchain provider to use when constructing
             the action.
-        user_link_flags: Extra link flags to be passed with the library.
-        additional_inputs: Extra inputs for a link action involving the library.
 
     Returns:
-        A `LinkerInput` object containing the libraries that were created.
+        A `LibraryToLink` object containing the libraries that were created.
     """
     dynamic_library = None
     if is_dynamic:
@@ -151,24 +145,16 @@ def register_libraries_to_link(
     else:
         static_library = None
 
-    return cc_common.create_linker_input(
-        owner = owning_label,
-        libraries = depset(direct = [
-            cc_common.create_library_to_link(
-                actions = actions,
-                alwayslink = alwayslink,
-                cc_toolchain = swift_toolchain.cc_toolchain_info,
-                feature_configuration = cc_feature_configuration,
-                pic_static_library = static_library,
-                dynamic_library = dynamic_library,
-            ),
-        ]),
-        additional_inputs = depset(direct = additional_inputs),
-        user_link_flags = depset(direct = user_link_flags),
+    return cc_common.create_library_to_link(
+        actions = actions,
+        alwayslink = alwayslink,
+        cc_toolchain = swift_toolchain.cc_toolchain_info,
+        feature_configuration = cc_feature_configuration,
+        pic_static_library = static_library,
+        dynamic_library = dynamic_library,
     )
 
 def register_link_binary_action(
-        owning_label,
         actions,
         additional_inputs,
         additional_linking_contexts,
@@ -184,7 +170,6 @@ def register_link_binary_action(
     """Registers an action that invokes the linker to produce a binary.
 
     Args:
-        owning_label: Label of the rule creating the link action.
         actions: The object used to register actions.
         additional_inputs: A list of additional inputs to the link action,
             such as those used in `$(location ...)` substitution, linker
@@ -246,12 +231,7 @@ def register_link_binary_action(
 
             linking_contexts.append(
                 cc_common.create_linking_context(
-                    linker_inputs = depset(direct = [
-                        cc_common.create_linker_input(
-                            owner = owning_label,
-                            user_link_flags = depset(direct = dep_link_flags),
-                        ),
-                    ])
+                    user_link_flags = dep_link_flags,
                 ),
             )
 

swift/internal/swift_binary_test.bzl

@@ -237,7 +237,6 @@ def _swift_linking_rule_impl(
     user_link_flags.extend(ctx.fragments.cpp.linkopts)
 
     linking_outputs = register_link_binary_action(
-        owning_label = ctx.label,
         actions = ctx.actions,
         additional_inputs = additional_inputs_to_linker,
         additional_linking_contexts = additional_linking_contexts,

swift/internal/swift_grpc_library.bzl

@@ -293,8 +293,7 @@ def _swift_grpc_library_impl(ctx):
         target_name = ctx.label.name,
     )
 
-    linker_input = register_libraries_to_link(
-        owning_label = ctx.label,
+    library_to_link = register_libraries_to_link(
         actions = ctx.actions,
         alwayslink = False,
         cc_feature_configuration = swift_common.cc_feature_configuration(
@@ -305,16 +304,14 @@ def _swift_grpc_library_impl(ctx):
         library_name = ctx.label.name,
         objects = compilation_outputs.object_files,
         swift_toolchain = swift_toolchain,
-        additional_inputs = compilation_outputs.linker_inputs,
-        user_link_flags = compilation_outputs.linker_flags,
     )
 
     providers = [
         DefaultInfo(
             files = depset(direct = generated_files + compact([
                 compilation_outputs.swiftdoc,
                 compilation_outputs.swiftmodule,
-                linker_input.libraries[0].pic_static_library,
+                library_to_link.pic_static_library,
             ])),
         ),
         OutputGroupInfo(**output_groups_from_compilation_outputs(
@@ -323,7 +320,7 @@ def _swift_grpc_library_impl(ctx):
         create_cc_info(
             cc_infos = get_providers(compile_deps, CcInfo),
             compilation_outputs = compilation_outputs,
-            linker_inputs = [linker_input],
+            libraries_to_link = [library_to_link],
         ),
         deps[0][SwiftProtoInfo],
         swift_common.create_swift_info(
@@ -349,7 +346,7 @@ def _swift_grpc_library_impl(ctx):
             link_inputs = compilation_outputs.linker_inputs,
             linkopts = compilation_outputs.linker_flags,
             module_map = compilation_outputs.generated_module_map,
-            static_archives = compact([linker_input.libraries[0].pic_static_library]),
+            static_archives = compact([library_to_link.pic_static_library]),
             swiftmodules = [compilation_outputs.swiftmodule],
             objc_header = compilation_outputs.generated_header,
         ))

swift/internal/swift_import.bzl

@@ -38,18 +38,14 @@ def _swift_import_impl(ctx):
         unsupported_features = ctx.disabled_features,
     )
 
-    linker_inputs = [
-        cc_common.create_linker_input(
-            libraries = depset(direct = [
-                cc_common.create_library_to_link(
-                    actions = ctx.actions,
-                    cc_toolchain = cc_toolchain,
-                    feature_configuration = cc_feature_configuration,
-                    static_library = archive,
-                )
-                for archive in archives
-            ]),
-        ),
+    libraries_to_link = [
+        cc_common.create_library_to_link(
+            actions = ctx.actions,
+            cc_toolchain = cc_toolchain,
+            feature_configuration = cc_feature_configuration,
+            static_library = archive,
+        )
+        for archive in archives
     ]
 
     providers = [
@@ -63,7 +59,7 @@ def _swift_import_impl(ctx):
         ),
         create_cc_info(
             cc_infos = get_providers(deps, CcInfo),
-            linker_inputs = linker_inputs,
+            libraries_to_link = libraries_to_link,
         ),
         # Propagate an `Objc` provider so that Apple-specific rules like
         # apple_binary` will link the imported library properly. Typically we'd

swift/internal/swift_library.bzl

@@ -179,8 +179,7 @@ def _swift_library_impl(ctx):
     else:
         clang_module = None
 
-    linker_input = register_libraries_to_link(
-        owning_label = ctx.label,
+    library_to_link = register_libraries_to_link(
         actions = ctx.actions,
         alwayslink = ctx.attr.alwayslink,
         cc_feature_configuration = swift_common.cc_feature_configuration(
@@ -191,16 +190,14 @@ def _swift_library_impl(ctx):
         library_name = ctx.label.name,
         objects = compilation_outputs.object_files,
         swift_toolchain = swift_toolchain,
-        user_link_flags = linkopts,
-        additional_inputs = compilation_outputs.linker_inputs,
     )
 
     direct_output_files = compact([
         compilation_outputs.generated_header,
         compilation_outputs.swiftdoc,
         compilation_outputs.swiftinterface,
         compilation_outputs.swiftmodule,
-        linker_input.libraries[0].pic_static_library,
+        library_to_link.pic_static_library,
     ])
 
     providers = [
@@ -216,12 +213,14 @@ def _swift_library_impl(ctx):
             compilation_outputs = compilation_outputs,
         )),
         create_cc_info(
+            additional_inputs = additional_inputs,
             cc_infos = get_providers(deps, CcInfo),
             compilation_outputs = compilation_outputs,
             defines = ctx.attr.defines,
             includes = [ctx.bin_dir.path],
-            linker_inputs = [linker_input],
+            libraries_to_link = [library_to_link],
             private_cc_infos = get_providers(private_deps, CcInfo),
+            user_link_flags = linkopts,
         ),
         coverage_common.instrumented_files_info(
             ctx,
@@ -262,7 +261,7 @@ def _swift_library_impl(ctx):
             link_inputs = compilation_outputs.linker_inputs + additional_inputs,
             linkopts = compilation_outputs.linker_flags + linkopts,
             module_map = compilation_outputs.generated_module_map,
-            static_archives = compact([linker_input.libraries[0].pic_static_library]),
+            static_archives = compact([library_to_link.pic_static_library]),
             swiftmodules = [compilation_outputs.swiftmodule],
             objc_header = compilation_outputs.generated_header,
         ))

swift/internal/swift_module_alias.bzl

@@ -72,8 +72,7 @@ def _swift_module_alias_impl(ctx):
         target_name = ctx.label.name,
     )
 
-    linker_input = register_libraries_to_link(
-        owning_label = ctx.label,
+    library_to_link = register_libraries_to_link(
         actions = ctx.actions,
         alwayslink = False,
         cc_feature_configuration = swift_common.cc_feature_configuration(
@@ -84,16 +83,15 @@ def _swift_module_alias_impl(ctx):
         library_name = ctx.label.name,
         objects = compilation_outputs.object_files,
         swift_toolchain = swift_toolchain,
-        additional_inputs = compilation_outputs.linker_inputs,
     )
 
     providers = [
         DefaultInfo(
             files = depset(compact([
                 compilation_outputs.swiftdoc,
                 compilation_outputs.swiftmodule,
-                linker_input.libraries[0].dynamic_library,
-                linker_input.libraries[0].pic_static_library,
+                library_to_link.dynamic_library,
+                library_to_link.pic_static_library,
             ])),
         ),
         OutputGroupInfo(**output_groups_from_compilation_outputs(
@@ -107,7 +105,7 @@ def _swift_module_alias_impl(ctx):
             cc_infos = get_providers(deps, CcInfo),
             compilation_outputs = compilation_outputs,
             includes = [ctx.bin_dir.path],
-            linker_inputs = [linker_input],
+            libraries_to_link = [library_to_link],
         ),
         swift_common.create_swift_info(
             modules = [
@@ -132,7 +130,7 @@ def _swift_module_alias_impl(ctx):
             link_inputs = compilation_outputs.linker_inputs,
             linkopts = compilation_outputs.linker_flags,
             module_map = compilation_outputs.generated_module_map,
-            static_archives = compact([linker_input.libraries[0].pic_static_library]),
+            static_archives = compact([library_to_link.pic_static_library]),
             swiftmodules = [compilation_outputs.swiftmodule],
             objc_header = compilation_outputs.generated_header,
         ))

swift/internal/swift_protoc_gen_aspect.bzl

@@ -428,8 +428,7 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
             target_name = target.label.name,
         )
 
-        linker_input = register_libraries_to_link(
-            owning_label = aspect_ctx.label,
+        library_to_link = register_libraries_to_link(
             actions = aspect_ctx.actions,
             alwayslink = False,
             cc_feature_configuration = swift_common.cc_feature_configuration(
@@ -443,8 +442,6 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
             library_name = "{}.swift".format(target.label.name),
             objects = compilation_outputs.object_files,
             swift_toolchain = swift_toolchain,
-            additional_inputs = compilation_outputs.linker_inputs,
-            user_link_flags = compilation_outputs.linker_flags,
         )
 
         # It's bad practice to attach providers you don't own to other targets,
@@ -480,9 +477,9 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
                 objc_info_args["header"] = depset([
                     compilation_outputs.generated_header,
                 ])
-            if linker_input.libraries[0].pic_static_library:
+            if library_to_link.pic_static_library:
                 objc_info_args["library"] = depset(
-                    [linker_input.libraries[0].pic_static_library],
+                    [library_to_link.pic_static_library],
                     order = "topological",
                 )
             if compilation_outputs.linker_flags:
@@ -519,7 +516,7 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
                     cc_infos = cc_infos,
                     compilation_outputs = compilation_outputs,
                     includes = includes,
-                    linker_inputs = [linker_input],
+                    libraries_to_link = [library_to_link],
                 ),
                 objc_info = objc_info,
             ),