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

Cleanup more bitcode support #1030

Merged
merged 1 commit into from
May 8, 2023
Merged

Cleanup more bitcode support #1030

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
2 changes: 1 addition & 1 deletion swift/internal/compiling.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2820,7 +2820,7 @@ def _declare_multiple_outputs_and_write_output_file_map(
target_name = target_name,
src = src,
)
(output_objs if emits_bc else other_outputs).append(obj)
output_objs.append(obj)
src_output_map["llvm-bc"] = obj.path
else:
# Declare the object file (there is one per source file).
Expand Down
6 changes: 3 additions & 3 deletions test/output_file_map_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def output_file_map_test_suite(name):
"""

output_file_map_test(
name = "{}_without_bitcode".format(name),
name = "{}_default".format(name),
expected_mapping = {
"object": "test/fixtures/debug_settings/simple_objs/Empty.swift.o",
},
Expand All @@ -60,7 +60,7 @@ def output_file_map_test_suite(name):
# In Xcode13, the bitcode file needs to be in the output file map
# (https://github.com/bazelbuild/rules_swift/issues/682).
output_file_map_embed_bitcode_test(
name = "{}_embed_bitcode".format(name),
name = "{}_emit_bc".format(name),
expected_mapping = {
"llvm-bc": "test/fixtures/debug_settings/simple_objs/Empty.swift.bc",
},
Expand All @@ -71,7 +71,7 @@ def output_file_map_test_suite(name):
)

output_file_map_embed_bitcode_wmo_test(
name = "{}_embed_bitcode_wmo".format(name),
name = "{}_emit_bc_wmo".format(name),
expected_mapping = {
"llvm-bc": "test/fixtures/debug_settings/simple_objs/Empty.swift.bc",
},
Expand Down