rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Simplify trim-paths feature by merging all debuginfo options together

Browse Source
This commit is contained in:
Urgau
2024-03-19 13:51:22 +01:00
parent c5e7f45b62
commit 777c6b46cc
8 changed files with 17 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_codegen_llvm/src/back/write.rs
View File

@@ -257,13 +257,12 @@ pub fn target_machine_factory(
};
let debuginfo_compression = SmallCStr::new(&debuginfo_compression);
let should_prefer_remapped_for_split_debuginfo_paths =
sess.should_prefer_remapped_for_split_debuginfo_paths();
let should_prefer_remapped_paths = sess.should_prefer_remapped_for_codegen();
Arc::new(move |config: TargetMachineFactoryConfig| {
let path_to_cstring_helper = |path: Option<PathBuf>| -> CString {
let path = path.unwrap_or_default();
let path = if should_prefer_remapped_for_split_debuginfo_paths {
let path = if should_prefer_remapped_paths {
path_mapping.map_prefix(path).0
} else {
path.into()

2
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View File

@@ -875,7 +875,7 @@ pub fn build_compile_unit_di_node<'ll, 'tcx>(
)
// We get a path relative to the working directory from split_dwarf_path
.map(|f| {
if tcx.sess.should_prefer_remapped_for_split_debuginfo_paths() {
if tcx.sess.should_prefer_remapped_for_codegen() {
tcx.sess.source_map().path_mapping().map_prefix(f).0
} else {
f.into()