From 0a19e1cec66d2f1f52147c2b966c4fe645d17332 Mon Sep 17 00:00:00 2001 From: Elton Gao Date: Mon, 16 Sep 2024 17:17:01 -0400 Subject: [PATCH] Remove allocation of extra swift module --- rules/framework.bzl | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/rules/framework.bzl b/rules/framework.bzl index d6b9b71d..d7bffdf4 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -604,13 +604,11 @@ def _copy_swiftmodule(ctx, framework_files, virtualize_frameworks): ), ] -def _get_merged_swift_info(ctx, swift_module_context, framework_files, transitive_deps, virtualize_frameworks): +def _get_merged_swift_info(ctx, framework_files, transitive_deps, virtualize_frameworks): swift_info_fields = { "swift_infos": [dep[SwiftInfo] for dep in transitive_deps if SwiftInfo in dep], - "modules": [swift_module_context], + "modules": _copy_swiftmodule(ctx, framework_files, virtualize_frameworks) if framework_files.outputs.swiftmodule else [], } - if framework_files.outputs.swiftmodule: - swift_info_fields["modules"] += _copy_swiftmodule(ctx, framework_files, virtualize_frameworks) return swift_common.create_swift_info(**swift_info_fields) def _merge_root_infoplists(ctx): @@ -1072,13 +1070,11 @@ def _apple_framework_packaging_impl(ctx): # If not virtualizing the framework - then it runs a "clean" _get_symlinked_framework_clean_action(ctx, framework_files, compilation_context_fields) - compilation_context = cc_common.create_compilation_context( - **compilation_context_fields - ) - # Construct the `CcInfo` provider, the linking context here used instead of ObjcProvider in Bazel 7+. cc_info_provider = CcInfo( - compilation_context = compilation_context, + compilation_context = cc_common.create_compilation_context( + **compilation_context_fields + ), linking_context = cc_common.create_linking_context( linker_inputs = _get_cc_info_linker_inputs(deps = deps) if is_bazel_7 else depset([]), ), @@ -1108,15 +1104,7 @@ def _apple_framework_packaging_impl(ctx): bundle_outs = _bundle_static_framework(ctx, is_extension_safe = is_extension_safe, current_apple_platform = current_apple_platform, outputs = outputs) avoid_deps_info = AvoidDepsInfo(libraries = depset(avoid_deps).to_list(), link_dynamic = False) - # rules_swift 2.x no longers takes compilation_context from CcInfo, need to pass it in via SwiftInfo - swift_module_context = swift_common.create_module( - name = ctx.attr.name, - clang = swift_common.create_clang_module( - compilation_context = compilation_context, - module_map = None, - ), - ) - swift_info = _get_merged_swift_info(ctx, swift_module_context, framework_files, transitive_deps, virtualize_frameworks) + swift_info = _get_merged_swift_info(ctx, framework_files, transitive_deps, virtualize_frameworks) # Build out the default info provider out_files = _compact([outputs.binary, outputs.swiftmodule, outputs.infoplist])