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

Auto merge of #98638 - bjorn3:less_string_interning, r=tmiasko

Browse Source 
Use less string interning

This removes string interning in a couple of places where doing so won't result in perf improvements. I also switched one place to use pre-interned symbols.
This commit is contained in:
bors
2022-07-08 10:03:27 +00:00
parent 0f97e02bdc f688f4d1e4
commit 1dcff2d507
14 changed files with 103 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_codegen_ssa/src/back/link.rs
View File

@@ -358,7 +358,7 @@ fn link_rlib<'a, B: ArchiveBuilder<'a>>(
}
if let Some(name) = lib.name {
let location =
find_library(name, lib.verbatim.unwrap_or(false), &lib_search_paths, sess);
find_library(name.as_str(), lib.verbatim.unwrap_or(false), &lib_search_paths, sess);
ab.add_archive(&location, |_| false).unwrap_or_else(|e| {
sess.fatal(&format!(
"failed to add native library {}: {}",
@@ -1122,7 +1122,7 @@ fn link_sanitizer_runtime(sess: &Session, linker: &mut dyn Linker, name: &str) {
let path = find_sanitizer_runtime(&sess, &filename);
let rpath = path.to_str().expect("non-utf8 component in path");
linker.args(&["-Wl,-rpath", "-Xlinker", rpath]);
linker.link_dylib(Symbol::intern(&filename), false, true);
linker.link_dylib(&filename, false, true);
} else {
let filename = format!("librustc{}_rt.{}.a", channel, name);
let path = find_sanitizer_runtime(&sess, &filename).join(&filename);
@@ -2204,6 +2204,7 @@ fn add_local_native_libraries(
let Some(name) = lib.name else {
continue;
};
let name = name.as_str();
// Skip if this library is the same as the last.
last = if (lib.name, lib.kind, lib.verbatim) == last {
@@ -2367,6 +2368,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
let Some(name) = lib.name else {
continue;
};
let name = name.as_str();
if !relevant_lib(sess, lib) {
continue;
}
@@ -2524,7 +2526,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
}
let filestem = cratepath.file_stem().unwrap().to_str().unwrap();
cmd.link_rust_dylib(
Symbol::intern(&unlib(&sess.target, filestem)),
&unlib(&sess.target, filestem),
parent.unwrap_or_else(|| Path::new("")),
);
}
@@ -2556,6 +2558,7 @@ fn add_upstream_native_libraries(
let Some(name) = lib.name else {
continue;
};
let name = name.as_str();
if !relevant_lib(sess, &lib) {
continue;
}