OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use tcx.symbol_name to check for clashes.

Browse Source
This commit is contained in:
jumbatm 2020-12-13 23:02:32 +10:00
parent 6318db1c5a
commit 15c64a181b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_lint/src/builtin.rs
View File

@ -43,6 +43,7 @@ use rustc_index::vec::Idx;
use rustc_middle::lint::LintDiagnosticBuilder;
use rustc_middle::ty::print::with_no_trimmed_paths;
use rustc_middle::ty::subst::{GenericArgKind, Subst};
use rustc_middle::ty::Instance;
use rustc_middle::ty::{self, layout::LayoutError, Ty, TyCtxt};
use rustc_session::Session;
use rustc_span::edition::Edition;
@ -2595,7 +2596,7 @@ declare_lint! {
}
pub struct ClashingExternDeclarations {
seen_decls: FxHashMap<Symbol, HirId>,
seen_decls: FxHashMap<String, HirId>,
}
/// Differentiate between whether the name for an extern decl came from the link_name attribute or
@ -2626,16 +2627,17 @@ impl ClashingExternDeclarations {
fn insert(&mut self, tcx: TyCtxt<'_>, fi: &hir::ForeignItem<'_>) -> Option<HirId> {
let hid = fi.hir_id;
let name =
&tcx.codegen_fn_attrs(tcx.hir().local_def_id(hid)).link_name.unwrap_or(fi.ident.name);
if self.seen_decls.contains_key(name) {
let local_did = tcx.hir().local_def_id(fi.hir_id);
let did = local_did.to_def_id();
let instance = Instance::new(did, ty::List::identity_for_item(tcx, did));
let name = tcx.symbol_name(instance).name.to_string();
if self.seen_decls.contains_key(&name) {
// Avoid updating the map with the new entry when we do find a collision. We want to
// make sure we're always pointing to the first definition as the previous declaration.
// This lets us avoid emitting "knock-on" diagnostics.
Some(*self.seen_decls.get(name).unwrap())
Some(*self.seen_decls.get(&name).unwrap())
} else {
self.seen_decls.insert(*name, hid)
self.seen_decls.insert(name, hid)
}
}