diff --git a/src/cargo/ops/cargo_compile/mod.rs b/src/cargo/ops/cargo_compile/mod.rs index 7eed3cc1ef2..6d45e69026c 100644 --- a/src/cargo/ops/cargo_compile/mod.rs +++ b/src/cargo/ops/cargo_compile/mod.rs @@ -35,6 +35,7 @@ //! [`drain_the_queue`]: crate::core::compiler::job_queue //! ["Cargo Target"]: https://doc.rust-lang.org/nightly/cargo/reference/cargo-targets.html +use cargo_platform::Cfg; use std::collections::{HashMap, HashSet}; use std::hash::{Hash, Hasher}; use std::sync::Arc; @@ -436,6 +437,7 @@ pub fn create_bcx<'a, 'gctx>( &units, &scrape_units, host_kind_requested.then_some(explicit_host_kind), + &target_data, ); let mut extra_compiler_args = HashMap::new(); @@ -575,6 +577,7 @@ fn rebuild_unit_graph_shared( roots: &[Unit], scrape_units: &[Unit], to_host: Option, + target_data: &RustcTargetData<'_>, ) -> (Vec, Vec, UnitGraph) { let mut result = UnitGraph::new(); // Map of the old unit to the new unit, used to avoid recursing into units @@ -591,6 +594,7 @@ fn rebuild_unit_graph_shared( root, false, to_host, + target_data, ) }) .collect(); @@ -617,6 +621,7 @@ fn traverse_and_share( unit: &Unit, unit_is_for_host: bool, to_host: Option, + target_data: &RustcTargetData<'_>, ) -> Unit { if let Some(new_unit) = memo.get(unit) { // Already computed, no need to recompute. @@ -634,6 +639,7 @@ fn traverse_and_share( &dep.unit, dep.unit_for.is_for_host(), to_host, + target_data, ); new_dep_unit.hash(&mut dep_hash); UnitDep { @@ -657,8 +663,13 @@ fn traverse_and_share( _ => 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(); - 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 // with this unit have debuginfo turned off, we enable debuginfo stripping. // This will remove pre-existing debug symbols coming from the standard library.