Rollup merge of #120107 - shepmaster:dead-code-repr-transparent, r=Nilstrieb
dead_code treats #[repr(transparent)] the same as #[repr(C)] In #92972 we enabled linting on unused fields in tuple structs. In #118297 that lint was enabled by default. That exposed issues like #119659, where the fields of a struct marked `#[repr(transparent)]` were reported by the `dead_code` lint. The language team [decided](https://github.com/rust-lang/rust/issues/119659#issuecomment-1885172045) that the lint should treat `repr(transparent)` the same as `#[repr(C)]`. Fixes #119659
This commit is contained in:
commit
332f8f73ea
8 changed files with 29 additions and 14 deletions
|
@ -57,7 +57,7 @@ struct MarkSymbolVisitor<'tcx> {
|
||||||
tcx: TyCtxt<'tcx>,
|
tcx: TyCtxt<'tcx>,
|
||||||
maybe_typeck_results: Option<&'tcx ty::TypeckResults<'tcx>>,
|
maybe_typeck_results: Option<&'tcx ty::TypeckResults<'tcx>>,
|
||||||
live_symbols: LocalDefIdSet,
|
live_symbols: LocalDefIdSet,
|
||||||
repr_has_repr_c: bool,
|
repr_unconditionally_treats_fields_as_live: bool,
|
||||||
repr_has_repr_simd: bool,
|
repr_has_repr_simd: bool,
|
||||||
in_pat: bool,
|
in_pat: bool,
|
||||||
ignore_variant_stack: Vec<DefId>,
|
ignore_variant_stack: Vec<DefId>,
|
||||||
|
@ -365,15 +365,17 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let had_repr_c = self.repr_has_repr_c;
|
let unconditionally_treated_fields_as_live =
|
||||||
|
self.repr_unconditionally_treats_fields_as_live;
|
||||||
let had_repr_simd = self.repr_has_repr_simd;
|
let had_repr_simd = self.repr_has_repr_simd;
|
||||||
self.repr_has_repr_c = false;
|
self.repr_unconditionally_treats_fields_as_live = false;
|
||||||
self.repr_has_repr_simd = false;
|
self.repr_has_repr_simd = false;
|
||||||
match node {
|
match node {
|
||||||
Node::Item(item) => match item.kind {
|
Node::Item(item) => match item.kind {
|
||||||
hir::ItemKind::Struct(..) | hir::ItemKind::Union(..) => {
|
hir::ItemKind::Struct(..) | hir::ItemKind::Union(..) => {
|
||||||
let def = self.tcx.adt_def(item.owner_id);
|
let def = self.tcx.adt_def(item.owner_id);
|
||||||
self.repr_has_repr_c = def.repr().c();
|
self.repr_unconditionally_treats_fields_as_live =
|
||||||
|
def.repr().c() || def.repr().transparent();
|
||||||
self.repr_has_repr_simd = def.repr().simd();
|
self.repr_has_repr_simd = def.repr().simd();
|
||||||
|
|
||||||
intravisit::walk_item(self, item)
|
intravisit::walk_item(self, item)
|
||||||
|
@ -411,7 +413,7 @@ impl<'tcx> MarkSymbolVisitor<'tcx> {
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
self.repr_has_repr_simd = had_repr_simd;
|
self.repr_has_repr_simd = had_repr_simd;
|
||||||
self.repr_has_repr_c = had_repr_c;
|
self.repr_unconditionally_treats_fields_as_live = unconditionally_treated_fields_as_live;
|
||||||
}
|
}
|
||||||
|
|
||||||
fn mark_as_used_if_union(&mut self, adt: ty::AdtDef<'tcx>, fields: &[hir::ExprField<'_>]) {
|
fn mark_as_used_if_union(&mut self, adt: ty::AdtDef<'tcx>, fields: &[hir::ExprField<'_>]) {
|
||||||
|
@ -435,11 +437,11 @@ impl<'tcx> Visitor<'tcx> for MarkSymbolVisitor<'tcx> {
|
||||||
|
|
||||||
fn visit_variant_data(&mut self, def: &'tcx hir::VariantData<'tcx>) {
|
fn visit_variant_data(&mut self, def: &'tcx hir::VariantData<'tcx>) {
|
||||||
let tcx = self.tcx;
|
let tcx = self.tcx;
|
||||||
let has_repr_c = self.repr_has_repr_c;
|
let unconditionally_treat_fields_as_live = self.repr_unconditionally_treats_fields_as_live;
|
||||||
let has_repr_simd = self.repr_has_repr_simd;
|
let has_repr_simd = self.repr_has_repr_simd;
|
||||||
let live_fields = def.fields().iter().filter_map(|f| {
|
let live_fields = def.fields().iter().filter_map(|f| {
|
||||||
let def_id = f.def_id;
|
let def_id = f.def_id;
|
||||||
if has_repr_c || (f.is_positional() && has_repr_simd) {
|
if unconditionally_treat_fields_as_live || (f.is_positional() && has_repr_simd) {
|
||||||
return Some(def_id);
|
return Some(def_id);
|
||||||
}
|
}
|
||||||
if !tcx.visibility(f.hir_id.owner.def_id).is_public() {
|
if !tcx.visibility(f.hir_id.owner.def_id).is_public() {
|
||||||
|
@ -741,7 +743,7 @@ fn live_symbols_and_ignored_derived_traits(
|
||||||
tcx,
|
tcx,
|
||||||
maybe_typeck_results: None,
|
maybe_typeck_results: None,
|
||||||
live_symbols: Default::default(),
|
live_symbols: Default::default(),
|
||||||
repr_has_repr_c: false,
|
repr_unconditionally_treats_fields_as_live: false,
|
||||||
repr_has_repr_simd: false,
|
repr_has_repr_simd: false,
|
||||||
in_pat: false,
|
in_pat: false,
|
||||||
ignore_variant_stack: vec![],
|
ignore_variant_stack: vec![],
|
||||||
|
|
|
@ -171,7 +171,6 @@ struct WithHeader<H>(NonNull<u8>, PhantomData<H>);
|
||||||
/// An opaque representation of `WithHeader<H>` to avoid the
|
/// An opaque representation of `WithHeader<H>` to avoid the
|
||||||
/// projection invariance of `<T as Pointee>::Metadata`.
|
/// projection invariance of `<T as Pointee>::Metadata`.
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
#[allow(dead_code)] // Field only used through `WithHeader` type above.
|
|
||||||
struct WithOpaqueHeader(NonNull<u8>);
|
struct WithOpaqueHeader(NonNull<u8>);
|
||||||
|
|
||||||
impl WithOpaqueHeader {
|
impl WithOpaqueHeader {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
trait Empty {}
|
trait Empty {}
|
||||||
|
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
pub struct FunnyPointer(#[allow(dead_code)] dyn Empty);
|
pub struct FunnyPointer(dyn Empty);
|
||||||
|
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
pub struct Meta {
|
pub struct Meta {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
//@compile-flags: -Cdebug-assertions=no
|
//@compile-flags: -Cdebug-assertions=no
|
||||||
|
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
struct HasDrop(#[allow(dead_code)] u8);
|
struct HasDrop(u8);
|
||||||
|
|
||||||
impl Drop for HasDrop {
|
impl Drop for HasDrop {
|
||||||
fn drop(&mut self) {}
|
fn drop(&mut self) {}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
struct Foo(#[allow(dead_code)] u32);
|
struct Foo(u32);
|
||||||
|
|
||||||
const TRANSMUTED_U32: u32 = unsafe { mem::transmute(Foo(3)) };
|
const TRANSMUTED_U32: u32 = unsafe { mem::transmute(Foo(3)) };
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ use std::sync::{Mutex, RwLock};
|
||||||
struct Wrapper<T>(#[allow(dead_code)] T);
|
struct Wrapper<T>(#[allow(dead_code)] T);
|
||||||
|
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
struct Transparent<T>(#[allow(dead_code)] T);
|
struct Transparent<T>(T);
|
||||||
|
|
||||||
struct NoNiche<T>(UnsafeCell<T>);
|
struct NoNiche<T>(UnsafeCell<T>);
|
||||||
|
|
||||||
|
|
14
tests/ui/lint/dead-code/type-in-transparent.rs
Normal file
14
tests/ui/lint/dead-code/type-in-transparent.rs
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
// Verify that we do not warn on fields that are part of transparent types.
|
||||||
|
// check-pass
|
||||||
|
#![deny(dead_code)]
|
||||||
|
|
||||||
|
#[repr(transparent)]
|
||||||
|
struct NamedStruct { field: u8 }
|
||||||
|
|
||||||
|
#[repr(transparent)]
|
||||||
|
struct TupleStruct(u8);
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = NamedStruct { field: 1 };
|
||||||
|
let _ = TupleStruct(1);
|
||||||
|
}
|
|
@ -24,7 +24,7 @@ impl<'a> Drop for Aligned<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[repr(transparent)]
|
#[repr(transparent)]
|
||||||
struct NotCopy(#[allow(dead_code)] u8);
|
struct NotCopy(u8);
|
||||||
|
|
||||||
#[repr(packed)]
|
#[repr(packed)]
|
||||||
struct Packed<'a>(NotCopy, Aligned<'a>);
|
struct Packed<'a>(NotCopy, Aligned<'a>);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue