Skip to content

Starlarkify declare_compile_output_file and declare_other_output_file #758

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

Open
dzbarsky wants to merge 2 commits into
base: main
Choose a base branch
from
+20 −50
Open

Starlarkify declare_compile_output_file and declare_other_output_file #758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fac816
Starlarkify declare_compile_output_file
dzbarsky Jun 19, 2026
2bf0dc7
Starlarkify declare_other_output_file
dzbarsky Jun 19, 2026
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
70 changes: 20 additions & 50 deletions cc/private/compile/compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ load(
"CPP_SOURCE_TYPE_HEADER",
"CPP_SOURCE_TYPE_SOURCE",
"extensions",
"output_subdirectories",
"package_source_root",
"should_create_per_object_debug_info",
_use_pic_for_binaries = "use_pic_for_binaries",
_use_pic_for_dynamic_libs = "use_pic_for_dynamic_libs",
Expand Down Expand Up @@ -535,7 +537,6 @@ def _create_scan_deps_action(
dotd_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.INCLUDED_FILE_LIST,
Expand Down Expand Up @@ -675,7 +676,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modules_info_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_INFO,
Expand Down Expand Up @@ -705,7 +705,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
module_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = output_category,
Expand All @@ -725,7 +724,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
ddi_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = ddi_output_name,
)
_create_scan_deps_action(
Expand Down Expand Up @@ -784,7 +782,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP,
Expand All @@ -794,7 +791,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_input_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP_INPUT,
Expand Down Expand Up @@ -882,7 +878,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP,
Expand All @@ -892,7 +887,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_input_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP_INPUT,
Expand All @@ -908,7 +902,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
ddi_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = ddi_output_name,
)
_create_scan_deps_action(
Expand Down Expand Up @@ -936,7 +929,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP,
Expand All @@ -946,7 +938,6 @@ def _create_cc_compile_actions_with_cpp20_module_helper(
modmap_input_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.CPP_MODULES_MODMAP_INPUT,
Expand Down Expand Up @@ -1321,7 +1312,6 @@ def _create_cc_compile_actions(
output_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.PROCESSED_HEADER,
Expand All @@ -1331,7 +1321,6 @@ def _create_cc_compile_actions(
dotd_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.INCLUDED_FILE_LIST,
Expand All @@ -1344,7 +1333,6 @@ def _create_cc_compile_actions(
diagnostics_file = _get_compile_output_file(
action_construction_context,
label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.SERIALIZED_DIAGNOSTICS_FILE,
Expand Down Expand Up @@ -1557,7 +1545,6 @@ def _create_compile_source_action(
object_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = output_category,
Expand All @@ -1571,7 +1558,6 @@ def _create_compile_source_action(
category = output_category,
output_name = output_pic_nopic_name,
cc_toolchain = cc_toolchain,
configuration = configuration,
feature_configuration = feature_configuration,
) if enable_dotd_files else None
diagnostics_file = _maybe_declare_diagnostics_file(
Expand All @@ -1580,7 +1566,6 @@ def _create_compile_source_action(
category = output_category,
output_name = output_pic_nopic_name,
cc_toolchain = cc_toolchain,
configuration = configuration,
feature_configuration = feature_configuration,
)
gcno_file = _maybe_declare_gcno_file(
Expand All @@ -1589,18 +1574,16 @@ def _create_compile_source_action(
output_name = output_pic_nopic_name,
cc_toolchain = cc_toolchain,
cpp_configuration = cpp_configuration,
configuration = configuration,
enable_coverage = enable_coverage,
)

dwo_file = None
if generate_dwo and not bitcode_output:
dwo_file_name = paths.replace_extension(paths.basename(object_file.path), ".dwo")

dwo_file = _cc_internal.declare_other_output_file(
ctx = action_construction_context,
output_name = dwo_file_name,
object_file = object_file,
dwo_file = action_construction_context.actions.declare_file(
dwo_file_name,
sibling = object_file,
)

lto_indexing_file = None
Expand All @@ -1609,10 +1592,9 @@ def _create_compile_source_action(
paths.basename(object_file.path),
extensions.LTO_INDEXING_OBJECT_FILE[0],
)
lto_indexing_file = _cc_internal.declare_other_output_file(
ctx = action_construction_context,
output_name = lto_indexing_file_name,
object_file = object_file,
lto_indexing_file = action_construction_context.actions.declare_file(
lto_indexing_file_name,
sibling = object_file,
)

complete_copts = get_copts(
Expand Down Expand Up @@ -1784,7 +1766,6 @@ def _create_temps_action(
preprocess_object_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = category,
Expand All @@ -1794,7 +1775,6 @@ def _create_temps_action(
assembly_object_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.GENERATED_ASSEMBLY,
Expand All @@ -1808,7 +1788,6 @@ def _create_temps_action(
source_artifact = source_artifact,
category = category,
cc_toolchain = cc_toolchain,
configuration = configuration,
feature_configuration = feature_configuration,
) if enable_dotd_files else None
assembly_dotd_file = _maybe_declare_dotd_file(
Expand All @@ -1818,7 +1797,6 @@ def _create_temps_action(
source_artifact = source_artifact,
category = artifact_category.GENERATED_ASSEMBLY,
cc_toolchain = cc_toolchain,
configuration = configuration,
feature_configuration = feature_configuration,
) if enable_dotd_files else None

Expand All @@ -1828,7 +1806,6 @@ def _create_temps_action(
category = category,
output_name = output_name,
cc_toolchain = cc_toolchain,
configuration = configuration,
feature_configuration = feature_configuration,
)
assembly_diagnostics_file = _maybe_declare_diagnostics_file(
Expand All @@ -1838,7 +1815,6 @@ def _create_temps_action(
output_name = output_name,
cc_toolchain = cc_toolchain,
feature_configuration = feature_configuration,
configuration = configuration,
)
preprocess_compile_variables = get_specific_compile_build_variables(
source_file = source_artifact,
Expand Down Expand Up @@ -1952,7 +1928,6 @@ def _create_module_codegen_action(
gcno_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.COVERAGE_DATA_FILE,
Expand Down Expand Up @@ -1980,7 +1955,6 @@ def _create_module_codegen_action(
object_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.OBJECT_FILE,
Expand All @@ -1994,7 +1968,6 @@ def _create_module_codegen_action(
dotd_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.INCLUDED_FILE_LIST,
Expand All @@ -2007,7 +1980,6 @@ def _create_module_codegen_action(
diagnostics_file = _get_compile_output_file(
ctx = action_construction_context,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.SERIALIZED_DIAGNOSTICS_FILE,
Expand Down Expand Up @@ -2144,14 +2116,18 @@ def _create_module_action(
progress_message_prefix = progress_message_prefix,
)

def _get_compile_output_file(ctx, label, *, output_name, configuration):
file = _cc_internal.declare_compile_output_file(
ctx = ctx,
label = label,
output_name = output_name,
configuration = configuration,
def _get_compile_output_file(ctx, label, *, output_name):
output_path = paths.join(
package_source_root(
label.workspace_name,
label.package,
ctx.configuration.is_sibling_repository_layout(),
),
output_subdirectories.OBJS,
label.name,
output_name,
)
return file
return ctx.actions.declare_shareable_artifact(output_path)

def _use_dotd_file(feature_configuration, source_file):
extension = "." + source_file.extension if source_file.extension else ""
Expand Down Expand Up @@ -2221,7 +2197,6 @@ def _maybe_declare_dotd_file(
category,
output_name,
cc_toolchain,
configuration,
feature_configuration):
dotd_file = None
if (_use_dotd_file(feature_configuration, source_artifact)):
Expand All @@ -2240,7 +2215,6 @@ def _maybe_declare_dotd_file(
dotd_file = _get_compile_output_file(
ctx = ctx,
label = label,
configuration = configuration,
output_name = dotd_name,
)
return dotd_file
Expand All @@ -2251,8 +2225,7 @@ def _maybe_declare_diagnostics_file(
category,
output_name,
cc_toolchain,
feature_configuration,
configuration):
feature_configuration):
diagnostics_file = None
if feature_configuration.is_enabled("serialized_diagnostics_file"):
base_name = output_name
Expand All @@ -2270,7 +2243,6 @@ def _maybe_declare_diagnostics_file(
diagnostics_file = _get_compile_output_file(
ctx = ctx,
label = label,
configuration = configuration,
output_name = diagnostics_file_name,
)
return diagnostics_file
Expand All @@ -2281,14 +2253,12 @@ def _maybe_declare_gcno_file(
output_name,
cc_toolchain,
cpp_configuration,
configuration,
enable_coverage):
gcno_file = None
if enable_coverage and not cpp_configuration.use_llvm_coverage_map_format():
gcno_file = _get_compile_output_file(
ctx = ctx,
label = label,
configuration = configuration,
output_name = _cc_internal.get_artifact_name_for_category(
cc_toolchain = cc_toolchain,
category = artifact_category.COVERAGE_DATA_FILE,
Expand Down