bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Replace Session should_remap_filepaths with filename_display_preference

Browse source
This commit is contained in:
Urgau 2024-03-22 15:27:17 +01:00
parent 4f4fa42b0e
commit fefb8f1f9c
6 changed files with 48 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

23
compiler/rustc_codegen_cranelift/src/debuginfo/mod.rs
View file

@ -42,7 +42,7 @@ pub(crate) struct DebugContext {
namespace_map: DefIdMap<UnitEntryId>,
array_size_type: UnitEntryId,
should_remap_filepaths: bool,
filename_display_preference: FileNameDisplayPreference,
}
pub(crate) struct FunctionDebugContext {
@ -85,26 +85,17 @@ impl DebugContext {
let mut dwarf = DwarfUnit::new(encoding);
use rustc_session::config::RemapPathScopeComponents;
use rustc_session::RemapFileNameExt;
let should_remap_filepaths =
tcx.sess.should_prefer_remapped(RemapPathScopeComponents::DEBUGINFO);
let filename_display_preference =
tcx.sess.filename_display_preference(RemapPathScopeComponents::DEBUGINFO);
let producer = producer(tcx.sess);
let comp_dir = tcx
.sess
.opts
.working_dir
.for_scope(tcx.sess, RemapPathScopeComponents::DEBUGINFO)
.to_string_lossy()
.to_string();
let comp_dir =
tcx.sess.opts.working_dir.to_string_lossy(filename_display_preference).to_string();
let (name, file_info) = match tcx.sess.local_crate_source_file() {
Some(path) => {
let name = path
.for_scope(tcx.sess, RemapPathScopeComponents::DEBUGINFO)
.to_string_lossy()
.to_string();
let name = path.to_string_lossy(filename_display_preference).to_string();
(name, None)
}
None => (tcx.crate_name(LOCAL_CRATE).to_string(), None),
@ -161,7 +152,7 @@ impl DebugContext {
stack_pointer_register,
namespace_map: DefIdMap::default(),
array_size_type,
should_remap_filepaths,
filename_display_preference,
}
}