Skip to content

Commit

Permalink
Automated rollback of commit b09469e.
Browse files Browse the repository at this point in the history
*** 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
  • Loading branch information
brandjon authored and copybara-github committed Aug 2, 2023
1 parent 9a047de commit d993957
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions src/main/starlark/builtins_bzl/common/cc/cc_binary.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit d993957

Please sign in to comment.