From d9939570353e21ba4d8b8e986b30b753a0f29c5d Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 2 Aug 2023 08:57:48 -0700 Subject: [PATCH] Automated rollback of commit b09469ea952d14e91f4f69f1181e2d19bc6d83f2. *** Reason for rollback *** Additional `.dwo` files cause actions to exceed input limits for remote execution *** Original change description *** Add `.dwo` files to the runfiles of cc_binary if `per_object_debug_info` feature is present as well as fission is on. PiperOrigin-RevId: 553160390 Change-Id: I10acfb1765cd7fd00be5298f18485845be9215cc --- .../starlark/builtins_bzl/common/cc/cc_binary.bzl | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl index 2cde637f5d3f29..945a21f53bf548 100644 --- a/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl +++ b/src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl @@ -217,15 +217,7 @@ def _add_transitive_info_providers(ctx, cc_toolchain, cpp_config, feature_config output_groups["_validation"] = compilation_context.validation_artifacts return (cc_info, instrumented_files_provider, output_groups) -def _collect_runfiles( - ctx, - feature_configuration, - cc_toolchain, - libraries, - cc_library_linking_outputs, - linking_mode, - transitive_artifacts, - link_compile_output_separately): +def _collect_runfiles(ctx, feature_configuration, cc_toolchain, libraries, cc_library_linking_outputs, linking_mode, transitive_artifacts, link_compile_output_separately): # TODO(b/198254254): Add Legacyexternalrunfiles if necessary. runtime_objects_for_coverage = [] builder_artifacts = [] @@ -638,6 +630,7 @@ def cc_binary_impl(ctx, additional_linkopts): additional_make_variable_substitutions = cc_helper.get_toolchain_global_make_variables(cc_toolchain) additional_make_variable_substitutions.update(cc_helper.get_cc_flags_make_variable(ctx, feature_configuration, cc_toolchain)) + (compilation_context, compilation_outputs) = cc_common.compile( name = ctx.label.name, actions = ctx.actions, @@ -812,8 +805,6 @@ def cc_binary_impl(ctx, additional_linkopts): transitive_artifacts_list = [files_to_build, runtime_libraries_extra] if cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "copy_dynamic_libraries_to_binary"): transitive_artifacts_list.append(copied_runtime_dynamic_libraries) - if cc_helper.should_create_per_object_debug_info(feature_configuration, cpp_config): - transitive_artifacts_list.append(dwo_files) transitive_artifacts = depset(transitive = transitive_artifacts_list) runtime_objects_for_coverage = [binary]