Cleanup more bitcode support (#1030)

bazelbuild · May 8, 2023 · e63c069 · e63c069
1 parent 9215fe5
commit e63c069
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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",
         },