From e63c069961dc39fcb65d60d5533448e0ff683a4e Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Mon, 8 May 2023 08:29:11 -0700 Subject: [PATCH] Cleanup more bitcode support (#1030) --- swift/internal/compiling.bzl | 2 +- test/output_file_map_tests.bzl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/swift/internal/compiling.bzl b/swift/internal/compiling.bzl index 982707eaf..b6078aa44 100644 --- a/swift/internal/compiling.bzl +++ b/swift/internal/compiling.bzl @@ -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). diff --git a/test/output_file_map_tests.bzl b/test/output_file_map_tests.bzl index b328bdc15..0d153f8b9 100644 --- a/test/output_file_map_tests.bzl +++ b/test/output_file_map_tests.bzl @@ -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", }, @@ -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", }, @@ -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", },