dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Lrc instead of Option to avoid duplication of a SearchPath

This commit is contained in:
bjorn3 2021-09-01 13:39:48 +02:00
parent 58000ed0e9
commit d7ef0b30e8
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_driver/src/lib.rs
View File

@ -677,10 +677,7 @@ impl RustcDefaultCalls {
println!("{}", targets.join("\n")); println!("{}", targets.join("\n"));
} }
Sysroot => println!("{}", sess.sysroot.display()), Sysroot => println!("{}", sess.sysroot.display()),
TargetLibdir => println!( TargetLibdir => println!("{}", sess.target_tlib_path.dir.display()),
"{}",
sess.target_tlib_path.as_ref().unwrap_or(&sess.host_tlib_path).dir.display()
),
TargetSpec => println!("{}", sess.target.to_json().pretty()), TargetSpec => println!("{}", sess.target.to_json().pretty()),
FileNames | CrateName => { FileNames | CrateName => {
let input = input.unwrap_or_else(|| { let input = input.unwrap_or_else(|| {

16
compiler/rustc_session/src/session.rs
View File

@ -131,9 +131,8 @@ pub struct Session {
pub target: Target, pub target: Target,
pub host: Target, pub host: Target,
pub opts: config::Options, pub opts: config::Options,
pub host_tlib_path: SearchPath, pub host_tlib_path: Lrc<SearchPath>,
/// `None` if the host and target are the same. pub target_tlib_path: Lrc<SearchPath>,
pub target_tlib_path: Option<SearchPath>,
pub parse_sess: ParseSess, pub parse_sess: ParseSess,
pub sysroot: PathBuf, pub sysroot: PathBuf,
/// The name of the root source file of the crate, in the local file system. /// The name of the root source file of the crate, in the local file system.
@ -784,8 +783,7 @@ impl Session {
&self.sysroot, &self.sysroot,
self.opts.target_triple.triple(), self.opts.target_triple.triple(),
&self.opts.search_paths, &self.opts.search_paths,
// `target_tlib_path == None` means it's the same as `host_tlib_path`. &self.target_tlib_path,
self.target_tlib_path.as_ref().unwrap_or(&self.host_tlib_path),
kind, kind,
) )
} }
@ -1254,11 +1252,13 @@ pub fn build_session(
let host_triple = config::host_triple(); let host_triple = config::host_triple();
let target_triple = sopts.target_triple.triple(); let target_triple = sopts.target_triple.triple();
let host_tlib_path = SearchPath::from_sysroot_and_triple(&sysroot, host_triple); let host_tlib_path = Lrc::new(SearchPath::from_sysroot_and_triple(&sysroot, host_triple));
let target_tlib_path = if host_triple == target_triple { let target_tlib_path = if host_triple == target_triple {
None // Use the same `SearchPath` if host and target triple are identical to avoid unnecessary
// rescanning of the target lib path and an unnecessary allocation.
host_tlib_path.clone()
} else { } else {
Some(SearchPath::from_sysroot_and_triple(&sysroot, target_triple)) Lrc::new(SearchPath::from_sysroot_and_triple(&sysroot, target_triple))
}; };
let file_path_mapping = sopts.file_path_mapping(); let file_path_mapping = sopts.file_path_mapping();