Skip to content

Commit 02c1e3d

Browse files
authored
Rollup merge of rust-lang#59441 - TheGoddessInari:natvis, r=alexcrichton
Remove the block on natvis for lld-link. Since rust-lang#56642 bumped minimum LLVM version to 6.0.0, Rust should be able to honor or ignore Windows natvis support with lld-link. It looks like llvm-mirror/lld@9133ca57b was in LLVM 7.0, while llvm-mirror/lld@27b9c4285 made it into 6.0, at least if the release branches are anything to go by. Fixes rust-lang#59383.
2 parents 95ef5eb + 2a42819 commit 02c1e3d

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

src/librustc_codegen_ssa/back/linker.rs

-12
Original file line numberDiff line numberDiff line change
@@ -596,18 +596,6 @@ impl<'a> Linker for MsvcLinker<'a> {
596596
// This will cause the Microsoft linker to embed .natvis info into the PDB file
597597
let natvis_dir_path = self.sess.sysroot.join("lib\\rustlib\\etc");
598598
if let Ok(natvis_dir) = fs::read_dir(&natvis_dir_path) {
599-
// LLVM 5.0.0's lld-link frontend doesn't yet recognize, and chokes
600-
// on, the /NATVIS:... flags. LLVM 6 (or earlier) should at worst ignore
601-
// them, eventually mooting this workaround, per this landed patch:
602-
// https://github.com/llvm-mirror/lld/commit/27b9c4285364d8d76bb43839daa100
603-
if let Some(ref linker_path) = self.sess.opts.cg.linker {
604-
if let Some(linker_name) = Path::new(&linker_path).file_stem() {
605-
if linker_name.to_str().unwrap().to_lowercase() == "lld-link" {
606-
self.sess.warn("not embedding natvis: lld-link may not support the flag");
607-
return;
608-
}
609-
}
610-
}
611599
for entry in natvis_dir {
612600
match entry {
613601
Ok(entry) => {

0 commit comments

Comments
 (0)