Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix top-level targets merging with mixed_language_library #3082

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fix top-level targets merging with mixed_language_library #3082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions xcodeproj/internal/processed_targets/incremental_top_level_targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,19 @@ def _process_focused_top_level_target(
transitive_infos = transitive_infos,
)

mergeable_info = mergeable_infos.calculate(
mergeable_info_and_ids = mergeable_infos.calculate(
avoid_deps = avoid_deps,
deps_infos = deps_infos,
dynamic_frameworks = linker_inputs._top_level_values.dynamic_frameworks,
id = id,
product_type = product_type,
xcode_inputs = target_inputs.xcode_inputs,
)
if mergeable_info_and_ids:
merged_target_ids = [(id, mergeable_info_and_ids.ids)]
mergeable_info = mergeable_info_and_ids.merged
else:
merged_target_ids = None
mergeable_info = None

actual_package_bin_dir = products.calculate_packge_bin_dir(
bin_dir_path = bin_dir_path,
Expand Down Expand Up @@ -574,7 +579,7 @@ def _process_focused_top_level_target(
inputs = provider_inputs,
is_top_level = True,
mergeable_infos = EMPTY_DEPSET,
merged_target_ids = mergeable_info.ids if mergeable_info else None,
merged_target_ids = merged_target_ids,
outputs = provider_outputs,
platform = platform.apple_platform,
swift_debug_settings = EMPTY_DEPSET,
Expand Down
176 changes: 81 additions & 95 deletions xcodeproj/internal/processed_targets/mergeable_infos.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def _calculate_mergeable_info(
avoid_deps,
deps_infos,
dynamic_frameworks,
id,
product_type,
xcode_inputs):
# We can only merge if this target doesn't have its own sources
Expand Down Expand Up @@ -70,20 +69,16 @@ def _calculate_mergeable_info(
if premerged_info:
# Mixed-language targets already ran through this process, so
# return that value
return premerged_info
return struct(ids = (mergeable_info.id,), merged = premerged_info)

if mergeable_info.swiftmodule:
return _swift_mergeable_info(
dynamic_frameworks = dynamic_frameworks,
id = id,
mergeable_info = mergeable_info,
product_type = product_type,
)
else:
return _cc_mergeable_info(
id = id,
mergeable_info = mergeable_info,
)
return _cc_mergeable_info(mergeable_info = mergeable_info)

if len(mergeable_infos) == 2:
# Only merge if one src is Swift and the other isn't
Expand Down Expand Up @@ -113,7 +108,6 @@ def _calculate_mergeable_info(
return _handle_mixed_language_mergeable_infos(
cc = cc,
dynamic_frameworks = dynamic_frameworks,
id = id,
product_type = product_type,
swift = swift,
)
Expand All @@ -124,63 +118,57 @@ def _calculate_mergeable_info(
def _calculate_mixed_language_mergeable_info(
*,
clang_target_info,
id,
product_type,
swift_target_info):
return _handle_mixed_language_mergeable_infos(
cc = clang_target_info.mergeable_infos.to_list()[0],
dynamic_frameworks = EMPTY_LIST,
id = id,
product_type = product_type,
swift = swift_target_info.mergeable_infos.to_list()[0],
)

def _cc_mergeable_info(*, id, mergeable_info):
def _cc_mergeable_info(*, mergeable_info):
return struct(
compile_target_ids = mergeable_info.id,
compile_target_ids_list = (mergeable_info.id,),
conly_args = mergeable_info.args.conly,
cxx_args = mergeable_info.args.cxx,
extra_file_paths = mergeable_info.inputs.extra_file_paths,
extra_files = mergeable_info.inputs.extra_files,
indexstores = mergeable_info.indexstores,
ids = ((id, (mergeable_info.id,)),),
is_mixed_langauge = False,
module_name = mergeable_info.module_name,
non_arc_srcs = mergeable_info.inputs.non_arc_srcs,
package_bin_dir = mergeable_info.package_bin_dir,
previews_dynamic_frameworks = EMPTY_LIST,
previews_include_path = EMPTY_STRING,
product_files = (mergeable_info.product_file,),
srcs = mergeable_info.inputs.srcs,
swift_args = EMPTY_LIST,
swift_debug_settings_to_merge = mergeable_info.swift_debug_settings,
ids = (mergeable_info.id,),
merged = struct(
compile_target_ids = mergeable_info.id,
compile_target_ids_list = (mergeable_info.id,),
conly_args = mergeable_info.args.conly,
cxx_args = mergeable_info.args.cxx,
extra_file_paths = mergeable_info.inputs.extra_file_paths,
extra_files = mergeable_info.inputs.extra_files,
indexstores = mergeable_info.indexstores,
is_mixed_langauge = False,
module_name = mergeable_info.module_name,
non_arc_srcs = mergeable_info.inputs.non_arc_srcs,
package_bin_dir = mergeable_info.package_bin_dir,
previews_dynamic_frameworks = EMPTY_LIST,
previews_include_path = EMPTY_STRING,
product_files = (mergeable_info.product_file,),
srcs = mergeable_info.inputs.srcs,
swift_args = EMPTY_LIST,
swift_debug_settings_to_merge = mergeable_info.swift_debug_settings,
),
)

def _handle_mixed_language_mergeable_infos(
*,
cc,
dynamic_frameworks,
id,
product_type,
swift):
if not cc.id:
return _swift_mergeable_info(
dynamic_frameworks = dynamic_frameworks,
id = id,
mergeable_info = swift,
product_type = product_type,
)
if not swift.id:
return _cc_mergeable_info(
id = id,
mergeable_info = cc,
)
return _cc_mergeable_info(mergeable_info = cc)

return _mixed_language_mergeable_info(
cc = cc,
dynamic_frameworks = dynamic_frameworks,
id = id,
product_type = product_type,
swift = swift,
)
Expand Down Expand Up @@ -213,7 +201,6 @@ def _mixed_language_mergeable_info(
*,
cc,
dynamic_frameworks,
id,
product_type,
swift):
previews_info = _previews_info(
Expand All @@ -223,74 +210,73 @@ def _mixed_language_mergeable_info(
)

return struct(
compile_target_ids = swift.id + " " + cc.id,
compile_target_ids_list = (swift.id, cc.id),
conly_args = cc.args.conly,
cxx_args = cc.args.cxx,
extra_file_paths = memory_efficient_depset(
transitive = [
swift.inputs.extra_file_paths,
cc.inputs.extra_file_paths,
],
),
extra_files = memory_efficient_depset(
transitive = [
swift.inputs.extra_files,
cc.inputs.extra_files,
],
ids = (swift.id, cc.id),
merged = struct(
compile_target_ids = swift.id + " " + cc.id,
compile_target_ids_list = (swift.id, cc.id),
conly_args = cc.args.conly,
cxx_args = cc.args.cxx,
extra_file_paths = memory_efficient_depset(
transitive = [
swift.inputs.extra_file_paths,
cc.inputs.extra_file_paths,
],
),
extra_files = memory_efficient_depset(
transitive = [
swift.inputs.extra_files,
cc.inputs.extra_files,
],
),
indexstores = tuple(list(swift.indexstores) + list(cc.indexstores)),
module_name = swift.module_name,
non_arc_srcs = cc.inputs.non_arc_srcs,
package_bin_dir = swift.package_bin_dir,
previews_dynamic_frameworks = previews_info.frameworks,
previews_include_path = previews_info.include_path,
product_files = (
swift.product_file,
cc.product_file,
),
srcs = memory_efficient_depset(
transitive = [
swift.inputs.srcs,
cc.inputs.srcs,
],
),
swift_args = swift.args.swift,
swift_debug_settings_to_merge = swift.swift_debug_settings,
),
indexstores = tuple(list(swift.indexstores) + list(cc.indexstores)),
ids = ((id, (swift.id, cc.id)),),
module_name = swift.module_name,
non_arc_srcs = cc.inputs.non_arc_srcs,
package_bin_dir = swift.package_bin_dir,
previews_dynamic_frameworks = previews_info.frameworks,
previews_include_path = previews_info.include_path,
product_files = (
swift.product_file,
cc.product_file,
),
srcs = memory_efficient_depset(
transitive = [
swift.inputs.srcs,
cc.inputs.srcs,
],
),
swift_args = swift.args.swift,
swift_debug_settings_to_merge = swift.swift_debug_settings,
)

def _swift_mergeable_info(
*,
dynamic_frameworks,
id,
mergeable_info,
product_type):
def _swift_mergeable_info(*, dynamic_frameworks, mergeable_info, product_type):
previews_info = _previews_info(
mergeable_info,
dynamic_frameworks = dynamic_frameworks,
product_type = product_type,
)

return struct(
compile_target_ids = mergeable_info.id,
compile_target_ids_list = (mergeable_info.id,),
conly_args = EMPTY_LIST,
cxx_args = EMPTY_LIST,
extra_file_paths = mergeable_info.inputs.extra_file_paths,
extra_files = mergeable_info.inputs.extra_files,
indexstores = mergeable_info.indexstores,
ids = ((id, (mergeable_info.id,)),),
is_mixed_langauge = False,
module_name = mergeable_info.module_name,
non_arc_srcs = EMPTY_DEPSET,
package_bin_dir = mergeable_info.package_bin_dir,
previews_dynamic_frameworks = previews_info.frameworks,
previews_include_path = previews_info.include_path,
product_files = (mergeable_info.product_file,),
srcs = mergeable_info.inputs.srcs,
swift_args = mergeable_info.args.swift,
swift_debug_settings_to_merge = mergeable_info.swift_debug_settings,
ids = (mergeable_info.id,),
merged = struct(
compile_target_ids = mergeable_info.id,
compile_target_ids_list = (mergeable_info.id,),
conly_args = EMPTY_LIST,
cxx_args = EMPTY_LIST,
extra_file_paths = mergeable_info.inputs.extra_file_paths,
extra_files = mergeable_info.inputs.extra_files,
indexstores = mergeable_info.indexstores,
is_mixed_langauge = False,
module_name = mergeable_info.module_name,
non_arc_srcs = EMPTY_DEPSET,
package_bin_dir = mergeable_info.package_bin_dir,
previews_dynamic_frameworks = previews_info.frameworks,
previews_include_path = previews_info.include_path,
product_files = (mergeable_info.product_file,),
srcs = mergeable_info.inputs.srcs,
swift_args = mergeable_info.args.swift,
swift_debug_settings_to_merge = mergeable_info.swift_debug_settings,
),
)

mergeable_infos = struct(
Expand Down
7 changes: 4 additions & 3 deletions xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,13 @@ def _process_mixed_language_library_target(
target = target,
)

mergeable_info = mergeable_infos_module.calculate_mixed_language(
mergeable_info_and_ids = mergeable_infos_module.calculate_mixed_language(
clang_target_info = clang_target_info,
id = id,
product_type = product_type,
swift_target_info = swift_target_info,
)
merged_target_ids = [(id, mergeable_info_and_ids.ids)]
mergeable_info = mergeable_info_and_ids.merged

(xcode_inputs, provider_inputs) = input_files.collect_mixed_language(
mergeable_info = mergeable_info,
Expand Down Expand Up @@ -221,7 +222,7 @@ def _process_mixed_language_library_target(
direct_dependencies = direct_dependencies,
inputs = provider_inputs,
mergeable_infos = mergeable_infos,
merged_target_ids = mergeable_info.ids,
merged_target_ids = merged_target_ids,
outputs = provider_outputs,
platform = platform.apple_platform,
swift_debug_settings = swift_target_info.swift_debug_settings,
Expand Down
Loading