mirror of https://github.com/rust-lang/cargo
Auto merge of #13654 - weihanglo:rust-1.77.0-backport, r=epage
[stable-1.77] Do not strip debuginfo by default for MSVC Stable backports: - https://github.com/rust-lang/cargo/pull/13630 In order to make CI pass, the following PRs are also cherry-picked: -
This commit is contained in:
commit
e52e360061
|
@ -252,7 +252,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cargo"
|
name = "cargo"
|
||||||
version = "0.78.0"
|
version = "0.78.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"annotate-snippets",
|
"annotate-snippets",
|
||||||
"anstream",
|
"anstream",
|
||||||
|
|
|
@ -124,7 +124,7 @@ self_named_module_files = "warn"
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "cargo"
|
name = "cargo"
|
||||||
version = "0.78.0"
|
version = "0.78.1"
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
rust-version = "1.75.0" # MSRV:1
|
rust-version = "1.75.0" # MSRV:1
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
//! [`drain_the_queue`]: crate::core::compiler::job_queue
|
//! [`drain_the_queue`]: crate::core::compiler::job_queue
|
||||||
//! ["Cargo Target"]: https://doc.rust-lang.org/nightly/cargo/reference/cargo-targets.html
|
//! ["Cargo Target"]: https://doc.rust-lang.org/nightly/cargo/reference/cargo-targets.html
|
||||||
|
|
||||||
|
use cargo_platform::Cfg;
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::hash::{Hash, Hasher};
|
use std::hash::{Hash, Hasher};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
@ -443,6 +444,7 @@ pub fn create_bcx<'a, 'cfg>(
|
||||||
&units,
|
&units,
|
||||||
&scrape_units,
|
&scrape_units,
|
||||||
host_kind_requested.then_some(explicit_host_kind),
|
host_kind_requested.then_some(explicit_host_kind),
|
||||||
|
&target_data,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -574,6 +576,7 @@ fn rebuild_unit_graph_shared(
|
||||||
roots: &[Unit],
|
roots: &[Unit],
|
||||||
scrape_units: &[Unit],
|
scrape_units: &[Unit],
|
||||||
to_host: Option<CompileKind>,
|
to_host: Option<CompileKind>,
|
||||||
|
target_data: &RustcTargetData<'_>,
|
||||||
) -> (Vec<Unit>, Vec<Unit>, UnitGraph) {
|
) -> (Vec<Unit>, Vec<Unit>, UnitGraph) {
|
||||||
let mut result = UnitGraph::new();
|
let mut result = UnitGraph::new();
|
||||||
// Map of the old unit to the new unit, used to avoid recursing into units
|
// Map of the old unit to the new unit, used to avoid recursing into units
|
||||||
|
@ -590,6 +593,7 @@ fn rebuild_unit_graph_shared(
|
||||||
root,
|
root,
|
||||||
false,
|
false,
|
||||||
to_host,
|
to_host,
|
||||||
|
target_data,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
@ -616,6 +620,7 @@ fn traverse_and_share(
|
||||||
unit: &Unit,
|
unit: &Unit,
|
||||||
unit_is_for_host: bool,
|
unit_is_for_host: bool,
|
||||||
to_host: Option<CompileKind>,
|
to_host: Option<CompileKind>,
|
||||||
|
target_data: &RustcTargetData<'_>,
|
||||||
) -> Unit {
|
) -> Unit {
|
||||||
if let Some(new_unit) = memo.get(unit) {
|
if let Some(new_unit) = memo.get(unit) {
|
||||||
// Already computed, no need to recompute.
|
// Already computed, no need to recompute.
|
||||||
|
@ -633,6 +638,7 @@ fn traverse_and_share(
|
||||||
&dep.unit,
|
&dep.unit,
|
||||||
dep.unit_for.is_for_host(),
|
dep.unit_for.is_for_host(),
|
||||||
to_host,
|
to_host,
|
||||||
|
target_data,
|
||||||
);
|
);
|
||||||
new_dep_unit.hash(&mut dep_hash);
|
new_dep_unit.hash(&mut dep_hash);
|
||||||
UnitDep {
|
UnitDep {
|
||||||
|
@ -656,8 +662,13 @@ fn traverse_and_share(
|
||||||
_ => unit.kind,
|
_ => unit.kind,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let cfg = target_data.cfg(unit.kind);
|
||||||
|
let is_target_windows_msvc = cfg.contains(&Cfg::Name("windows".to_string()))
|
||||||
|
&& cfg.contains(&Cfg::KeyPair("target_env".to_string(), "msvc".to_string()));
|
||||||
let mut profile = unit.profile.clone();
|
let mut profile = unit.profile.clone();
|
||||||
if profile.strip.is_deferred() {
|
// For MSVC, rustc currently treats -Cstrip=debuginfo same as -Cstrip=symbols, which causes
|
||||||
|
// this optimization to also remove symbols and thus break backtraces.
|
||||||
|
if profile.strip.is_deferred() && !is_target_windows_msvc {
|
||||||
// If strip was not manually set, and all dependencies of this unit together
|
// If strip was not manually set, and all dependencies of this unit together
|
||||||
// with this unit have debuginfo turned off, we enable debuginfo stripping.
|
// with this unit have debuginfo turned off, we enable debuginfo stripping.
|
||||||
// This will remove pre-existing debug symbols coming from the standard library.
|
// This will remove pre-existing debug symbols coming from the standard library.
|
||||||
|
|
|
@ -611,7 +611,9 @@ fn strip_accepts_false_to_disable_strip() {
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Temporarily disabled on Windows due to https://github.com/rust-lang/rust/issues/122857
|
||||||
#[cargo_test]
|
#[cargo_test]
|
||||||
|
#[cfg(not(windows))]
|
||||||
fn strip_debuginfo_in_release() {
|
fn strip_debuginfo_in_release() {
|
||||||
let p = project()
|
let p = project()
|
||||||
.file(
|
.file(
|
||||||
|
@ -630,7 +632,32 @@ fn strip_debuginfo_in_release() {
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Using -Cstrip=debuginfo in release mode by default is temporarily disabled on Windows due to
|
||||||
|
// https://github.com/rust-lang/rust/issues/122857
|
||||||
#[cargo_test]
|
#[cargo_test]
|
||||||
|
#[cfg(all(target_os = "windows", target_env = "msvc"))]
|
||||||
|
fn do_not_strip_debuginfo_in_release_on_windows() {
|
||||||
|
let p = project()
|
||||||
|
.file(
|
||||||
|
"Cargo.toml",
|
||||||
|
r#"
|
||||||
|
[package]
|
||||||
|
name = "foo"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2015"
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
.file("src/main.rs", "fn main() {}")
|
||||||
|
.build();
|
||||||
|
|
||||||
|
p.cargo("build --release -v")
|
||||||
|
.with_stderr_does_not_contain("[..]strip=debuginfo[..]")
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Temporarily disabled on Windows due to https://github.com/rust-lang/rust/issues/122857
|
||||||
|
#[cargo_test]
|
||||||
|
#[cfg(not(windows))]
|
||||||
fn strip_debuginfo_without_debug() {
|
fn strip_debuginfo_without_debug() {
|
||||||
let p = project()
|
let p = project()
|
||||||
.file(
|
.file(
|
||||||
|
|
|
@ -735,7 +735,9 @@ fn one_bin_multiple_examples() {
|
||||||
.run();
|
.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Temporarily disabled on Windows due to https://github.com/rust-lang/rust/issues/122857
|
||||||
#[cargo_test]
|
#[cargo_test]
|
||||||
|
#[cfg(not(windows))]
|
||||||
fn example_with_release_flag() {
|
fn example_with_release_flag() {
|
||||||
let p = project()
|
let p = project()
|
||||||
.file(
|
.file(
|
||||||
|
|
Loading…
Reference in New Issue