itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #9182 - alexcrichton:fix-lto-off, r=ehuss

Browse Source 
Propagate `lto=off` harder

This commit fixes an issue with LTO calculation for various units when
`lto=off` is specified in the profile. This ensures now that `lto=off`
is passed to all transitive dependencies as well to disable thin-local
LTO. As an added bonus this also passed `embed-bitcode=no` whenever
`lto=off` is specified since we know we won't be using bitcode anyway.

Closes #9171
This commit is contained in:
bors 2021-02-18 15:49:14 +00:00
commit bf5a5d5e5d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cargo/core/compiler/lto.rs
View File

@ -45,7 +45,8 @@ pub fn generate(bcx: &BuildContext<'_, '_>) -> CargoResult<HashMap<Unit, Lto>> {
for unit in bcx.roots.iter() { for unit in bcx.roots.iter() {
let root_lto = match unit.profile.lto { let root_lto = match unit.profile.lto {
// LTO not requested, no need for bitcode. // LTO not requested, no need for bitcode.
profiles::Lto::Bool(false) | profiles::Lto::Off => Lto::OnlyObject, profiles::Lto::Bool(false) => Lto::OnlyObject,
profiles::Lto::Off => Lto::Off,
_ => { _ => {
let crate_types = unit.target.rustc_crate_types(); let crate_types = unit.target.rustc_crate_types();
if unit.target.for_host() { if unit.target.for_host() {
@ -127,8 +128,8 @@ fn calculate(
(Lto::Run(_), false) => Lto::OnlyBitcode, (Lto::Run(_), false) => Lto::OnlyBitcode,
// LTO when something needs object code. // LTO when something needs object code.
(Lto::Run(_), true) | (Lto::OnlyBitcode, true) => lto_when_needs_object(&crate_types), (Lto::Run(_), true) | (Lto::OnlyBitcode, true) => lto_when_needs_object(&crate_types),
// LTO is disabled, no need for bitcode. // LTO is disabled, continue to disable it.
(Lto::Off, _) => Lto::OnlyObject, (Lto::Off, _) => Lto::Off,
// If this doesn't have any requirements, or the requirements are // If this doesn't have any requirements, or the requirements are
// already satisfied, then stay with our parent. // already satisfied, then stay with our parent.
(_, false) | (Lto::OnlyObject, true) | (Lto::ObjectAndBitcode, true) => parent_lto, (_, false) | (Lto::OnlyObject, true) | (Lto::ObjectAndBitcode, true) => parent_lto,

5
src/cargo/core/compiler/mod.rs
View File

@ -968,7 +968,10 @@ fn lto_args(cx: &Context<'_, '_>, unit: &Unit) -> Vec<OsString> {
match cx.lto[unit] { match cx.lto[unit] {
lto::Lto::Run(None) => push("lto"), lto::Lto::Run(None) => push("lto"),
lto::Lto::Run(Some(s)) => push(&format!("lto={}", s)), lto::Lto::Run(Some(s)) => push(&format!("lto={}", s)),
lto::Lto::Off => push("lto=off"), lto::Lto::Off => {
push("lto=off");
push("embed-bitcode=no");
}
lto::Lto::ObjectAndBitcode => {} // this is rustc's default lto::Lto::ObjectAndBitcode => {} // this is rustc's default
lto::Lto::OnlyBitcode => push("linker-plugin-lto"), lto::Lto::OnlyBitcode => push("linker-plugin-lto"),
lto::Lto::OnlyObject => push("embed-bitcode=no"), lto::Lto::OnlyObject => push("embed-bitcode=no"),

4
tests/testsuite/lto.rs
View File

@ -254,9 +254,9 @@ fn off_in_manifest_works() {
[DOWNLOADING] [..] [DOWNLOADING] [..]
[DOWNLOADED] [..] [DOWNLOADED] [..]
[COMPILING] bar v0.0.1 [COMPILING] bar v0.0.1
[RUNNING] `rustc --crate-name bar [..]--crate-type lib [..]-C embed-bitcode=no[..] [RUNNING] `rustc --crate-name bar [..]--crate-type lib [..]-C lto=off -C embed-bitcode=no[..]
[COMPILING] test [..] [COMPILING] test [..]
[RUNNING] `rustc --crate-name test [..]--crate-type lib [..]-C embed-bitcode=no[..] [RUNNING] `rustc --crate-name test [..]--crate-type lib [..]-C lto=off -C embed-bitcode=no[..]
[RUNNING] `rustc --crate-name test src/main.rs [..]--crate-type bin [..]-C lto=off[..] [RUNNING] `rustc --crate-name test src/main.rs [..]--crate-type bin [..]-C lto=off[..]
[FINISHED] [..] [FINISHED] [..]
", ",