@@ -4,7 +4,7 @@ use rustc_abi::{BackendRepr, TagEncoding, Variants, WrappingRange};
44use rustc_hir:: { Expr , ExprKind , HirId , LangItem } ;
55use rustc_middle:: bug;
66use rustc_middle:: ty:: layout:: { LayoutOf , SizeSkeleton } ;
7- use rustc_middle:: ty:: { self , Ty , TyCtxt , TypeVisitableExt } ;
7+ use rustc_middle:: ty:: { self , AdtKind , Ty , TyCtxt , TypeVisitableExt } ;
88use rustc_session:: { declare_lint, declare_lint_pass, impl_lint_pass} ;
99use rustc_span:: { Span , Symbol , sym} ;
1010use tracing:: debug;
@@ -925,6 +925,38 @@ fn get_nullable_type_from_pat<'tcx>(
925925 }
926926}
927927
928+ /// determines wether or not `outer_ty` is an option-like enum, with the same size as its contained type, `ty`.
929+ /// this ASSUMES that `ty` is a type that is already 'inside' of `outer_ty`.
930+ fn is_outer_optionlike_around_ty < ' tcx > (
931+ cx : & LateContext < ' tcx > ,
932+ outer_ty : Ty < ' tcx > ,
933+ ty : Ty < ' tcx > ,
934+ ) -> bool {
935+ // three things to check to be sure outer_ty is option-like (since we know we reached the current ty from there)
936+ // That outer_ty is an enum, that this enum doesn't have a defined discriminant representation,
937+ // and the the outer_ty's size is that of ty.
938+ if let ty:: Adt ( def, _) = outer_ty. kind ( ) {
939+ if !matches ! ( def. adt_kind( ) , AdtKind :: Enum )
940+ || def. repr ( ) . c ( )
941+ || def. repr ( ) . transparent ( )
942+ || def. repr ( ) . int . is_none ( )
943+ {
944+ false
945+ } else {
946+ let ( tcx, typing_env) = ( cx. tcx , cx. typing_env ( ) ) ;
947+
948+ // see the insides of super::repr_nullable_ptr()
949+ let compute_size_skeleton = |t| SizeSkeleton :: compute ( t, tcx, typing_env) . ok ( ) ;
950+ match ( compute_size_skeleton ( ty) , compute_size_skeleton ( outer_ty) ) {
951+ ( Some ( sk1) , Some ( sk2) ) => sk1. same_size ( sk2) ,
952+ _ => false ,
953+ }
954+ }
955+ } else {
956+ false
957+ }
958+ }
959+
928960declare_lint_pass ! ( VariantSizeDifferences => [ VARIANT_SIZE_DIFFERENCES ] ) ;
929961
930962impl < ' tcx > LateLintPass < ' tcx > for VariantSizeDifferences {
0 commit comments