Respect #[global_allocator] in cc_common.link builds
#1926
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krasimirgg
approved these changes
Apr 20, 2023
rust/private/repository_utils.bzl
Outdated
| @@ -270,6 +272,7 @@ def BUILD_for_rust_toolchain( | |||
| exec_triple (triple): The rust-style target that this compiler runs on | |||
| target_triple (triple): The rust-style target triple of the tool | |||
| allocator_library (str, optional): Target that provides allocator functions when rust_library targets are embedded in a cc_binary. | |||
| global_allocator_library (str, optional): Target that provides allocator functions global allocator is used with cc_common_link. | |||
There was a problem hiding this comment.
nit: Target that provides allocator functions when ...
nit: could you clarify that this applies only to non-exec mode
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
rustcgenerates allocator symbols at link time. When we link viacc_common.linkthose symbols are missing becauserustcis not driving the linking anymore. We compensate by providing the symbols via therust_toolchain.allocator_library.Rust also allows a global allocator to be specified (via
#[global_allocator]). The symbolsrustcgenerates at link time are different based on whether the system allocator is used, or a global allocator was specified.Currently, when linking via
cc_common.link,#[global_allocator]is completely ignored. This PR makes using a global allocator actually work:rust_toolchain.global_allocator_libraryattribute that can point to a set of symbols needed when#[global_allocator]is used.--@rules_rust//rust/settings:experimental_use_global_allocatorflag that is only observed when--@rules_rust//rust/settings:experimental_use_cc_common_link==True. At this point this flag only applies to the target configuration.Unrelated to the goal of this PR, I also modified visibility of a
rust_toolchainintest/toolchain/toolchain_test.bzlto address failures of Bazel rolling releases tasks (https://buildkite.com/bazel/rules-rust-rustlang/builds/8457#018799ff-5908-4b57-918b-a582ed12a248)