From b429888553626ea102496841ccde7301d79070a4 Mon Sep 17 00:00:00 2001 From: Jonathan Schear Date: Thu, 29 Jan 2026 16:25:00 -0500 Subject: [PATCH] Remove dead code for generation of module map used for Swift compilation --- cc/private/rules_impl/objc_common.bzl | 5 -- .../rules_impl/objc_compilation_support.bzl | 66 +------------------ .../objc_intermediate_artifacts.bzl | 24 ------- 3 files changed, 3 insertions(+), 92 deletions(-) diff --git a/cc/private/rules_impl/objc_common.bzl b/cc/private/rules_impl/objc_common.bzl index 9c99d46f6..8925849db 100644 --- a/cc/private/rules_impl/objc_common.bzl +++ b/cc/private/rules_impl/objc_common.bzl @@ -58,7 +58,6 @@ def _create_context_and_provider( compilation_attributes, compilation_artifacts, intermediate_artifacts, - has_module_map, deps, implementation_deps, attr_linkopts, @@ -151,10 +150,6 @@ def _create_context_and_provider( _filter_by_extension(compilation_artifacts.srcs, HEADERS), ) - if has_module_map: - module_map = intermediate_artifacts.swift_module_map() - objc_provider_kwargs["module_map"].append(module_map.file if type(module_map.file) == "File" else module_map.file()) - objc_provider_kwargs_built = {} for k, v in objc_provider_kwargs.items(): if k == "providers": diff --git a/cc/private/rules_impl/objc_compilation_support.bzl b/cc/private/rules_impl/objc_compilation_support.bzl index 2f6dc49be..ac5def195 100644 --- a/cc/private/rules_impl/objc_compilation_support.bzl +++ b/cc/private/rules_impl/objc_compilation_support.bzl @@ -75,7 +75,6 @@ def _build_common_variables( extra_enabled_features = [], attr_linkopts = [], alwayslink = False, - has_module_map = False, direct_cc_compilation_contexts = []): compilation_attributes = _create_compilation_attributes(ctx = ctx) intermediate_artifacts = create_intermediate_artifacts(ctx = ctx) @@ -98,7 +97,6 @@ def _build_common_variables( deps = deps, implementation_deps = implementation_deps, intermediate_artifacts = intermediate_artifacts, - has_module_map = has_module_map, attr_linkopts = attr_linkopts, direct_cc_compilation_contexts = direct_cc_compilation_contexts, includes = cc_helper.include_dirs(ctx, {}) if hasattr(ctx.attr, "includes") else [], @@ -120,7 +118,7 @@ def _build_common_variables( objc_provider = objc_provider, ) -def _build_feature_configuration(common_variables, for_swift_module_map, support_parse_headers): +def _build_feature_configuration(common_variables, support_parse_headers): ctx = common_variables.ctx enabled_features = [] @@ -134,14 +132,6 @@ def _build_feature_configuration(common_variables, for_swift_module_map, support if not support_parse_headers: disabled_features.append("parse_headers") - if for_swift_module_map: - enabled_features.append("module_maps") - enabled_features.append("compile_all_modules") - enabled_features.append("only_doth_headers_in_module_maps") - enabled_features.append("exclude_private_headers_in_module_maps") - enabled_features.append("module_map_without_extern_module") - disabled_features.append("generate_submodules") - return cc_common.configure_features( ctx = common_variables.ctx, cc_toolchain = common_variables.toolchain, @@ -262,8 +252,7 @@ def _paths_to_include_args(paths): def _register_compile_and_archive_actions( common_variables, extra_compile_args = [], - priority_headers = [], - generate_module_map_for_swift = False): + priority_headers = []): ctx = common_variables.ctx return _cc_compile_and_link( cc_helper.get_srcs(ctx), @@ -273,7 +262,6 @@ def _register_compile_and_archive_actions( common_variables, extra_compile_args, priority_headers, - generate_module_map_for_swift = generate_module_map_for_swift, ) # Returns a list of (Artifact, Label) tuples. Each tuple represents an input source @@ -302,8 +290,7 @@ def _cc_compile_and_link( public_hdrs, common_variables, extra_compile_args, - priority_headers, - generate_module_map_for_swift): + priority_headers): intermediate_artifacts = common_variables.intermediate_artifacts compilation_attributes = common_variables.compilation_attributes # buildifier: disable=unused-variable ctx = common_variables.ctx @@ -312,7 +299,6 @@ def _cc_compile_and_link( pch_header = _get_pch_file(common_variables) feature_configuration = _build_feature_configuration( common_variables, - for_swift_module_map = False, support_parse_headers = True, ) @@ -345,7 +331,6 @@ def _cc_compile_and_link( purpose = "{}_non_objc_arc".format(_get_purpose(common_variables)) non_arc_primary_module_map_fc = _build_feature_configuration( common_variables, - for_swift_module_map = False, support_parse_headers = False, ) non_arc_extensions = _build_variable_extensions(ctx, arc_enabled = False) @@ -364,24 +349,6 @@ def _cc_compile_and_link( generate_module_map = False, ) - objc_compilation_context = common_variables.objc_compilation_context - - if generate_module_map_for_swift: - _generate_extra_module_map( - common_variables, - intermediate_artifacts.swift_module_map(), - public_hdrs, - private_hdrs, - objc_compilation_context.public_textual_hdrs, - pch_header, - objc_compilation_context.cc_compilation_contexts, - _build_feature_configuration( - common_variables, - for_swift_module_map = True, - support_parse_headers = False, - ), - ) - compilation_context = cc_common.merge_compilation_contexts( compilation_contexts = [arc_compilation_context, non_arc_compilation_context], ) @@ -484,33 +451,6 @@ def _get_purpose(common_variables): config = common_variables.ctx.bin_dir.path.split("/")[1] return "Objc_build_arch_" + config + "_with_suffix_" + suffix -def _generate_extra_module_map( - common_variables, - module_map, - public_hdrs, - private_hdrs, - textual_hdrs, - pch_header, - compilation_contexts, - feature_configuration): - purpose = "{}_extra_module_map".format(_get_purpose(common_variables)) - all_textual_hdrs = [] - all_textual_hdrs.extend(textual_hdrs) - if pch_header != None: - all_textual_hdrs.append(pch_header) - cc_common.compile( - actions = common_variables.ctx.actions, - feature_configuration = feature_configuration, - cc_toolchain = common_variables.toolchain, - public_hdrs = public_hdrs, - textual_hdrs = textual_hdrs, - private_hdrs = private_hdrs, - compilation_contexts = compilation_contexts, - module_map = module_map, - purpose = purpose, - name = common_variables.ctx.label.name, - ) - compilation_support = struct( register_compile_and_archive_actions = _register_compile_and_archive_actions, build_common_variables = _build_common_variables, diff --git a/cc/private/rules_impl/objc_intermediate_artifacts.bzl b/cc/private/rules_impl/objc_intermediate_artifacts.bzl index d68a47349..6a86296d6 100644 --- a/cc/private/rules_impl/objc_intermediate_artifacts.bzl +++ b/cc/private/rules_impl/objc_intermediate_artifacts.bzl @@ -34,29 +34,6 @@ def _create_archive(ctx, enforce_always_link, archive_file_name_suffix): extension, ) -def _get_module_name(ctx): - if hasattr(ctx.attr, "module_name") and ctx.attr.module_name != "": - return ctx.attr.module_name - return ( - str(ctx.label) - .replace("//", "") - .replace("@", "") - .replace("-", "_") - .replace("/", "_") - .replace(":", "_") - ) - -def _swift_module_map(ctx): - module_name = _get_module_name(ctx) - custom_module_map = getattr(ctx.attr, "module_map", None) - return cc_common.create_module_map( - file = custom_module_map if custom_module_map else _declare_file_with_extension( - ctx, - ".modulemaps/module.modulemap", - ), - name = module_name, - ) - def _internal_module_map(ctx): return cc_common.create_module_map( file = _declare_file_with_extension(ctx, ".internal.cppmap"), @@ -69,7 +46,6 @@ def _create_closure_struct(ctx, archive_file_name_suffix, enforce_always_link): # TODO(b/331163027): Consider renaming publicly to "create_combined_architecture_archive". # Alteratively, consider deleting this method as it is not used anywhere in the repo. combined_architecture_archive = lambda: _create_combined_architecture_archive(ctx), - swift_module_map = lambda: _swift_module_map(ctx), internal_module_map = lambda: _internal_module_map(ctx), # TODO(b/331163027): Consider renaming publicly to "create_archive". archive = lambda: _create_archive(ctx, enforce_always_link, archive_file_name_suffix),