bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #119552 - krtab:dead_code_priv_mod_pub_field, r=cjgillot,saethlin

Browse source 
Replace visibility test with reachability test in dead code detection

Fixes https://github.com/rust-lang/rust/issues/119545

Also included is a fix for an error now flagged by the lint
This commit is contained in:
bors 2024-03-23 00:37:05 +00:00
commit c308726599
29 changed files with 129 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_passes/src/dead.rs
View file

@ -525,15 +525,16 @@ impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
let tcx = self.tcx;
let unconditionally_treat_fields_as_live = self.repr_unconditionally_treats_fields_as_live;
let has_repr_simd = self.repr_has_repr_simd;
let effective_visibilities = &tcx.effective_visibilities(());
let live_fields = def.fields().iter().filter_map(|f| {
let def_id = f.def_id;
if unconditionally_treat_fields_as_live || (f.is_positional() && has_repr_simd) {
return Some(def_id);
}
if !tcx.visibility(f.hir_id.owner.def_id).is_public() {
if !effective_visibilities.is_reachable(f.hir_id.owner.def_id) {
return None;
}
if tcx.visibility(def_id).is_public() { Some(def_id) } else { None }
if effective_visibilities.is_reachable(def_id) { Some(def_id) } else { None }
});
self.live_symbols.extend(live_fields);