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