@@ -18,7 +18,7 @@ use rustc_middle::ty::{List, TypeFoldable};
18
18
use rustc_smir:: rustc_internal;
19
19
use rustc_span:: def_id:: DefId ;
20
20
use rustc_target:: abi:: {
21
- Abi :: Vector , FieldIdx , FieldsShape , Float , Integer , LayoutS , Primitive , Size , TagEncoding ,
21
+ Abi :: Vector , FieldIdx , FieldsShape , Float , Integer , LayoutData , Primitive , Size , TagEncoding ,
22
22
TyAndLayout , VariantIdx , Variants ,
23
23
} ;
24
24
use stable_mir:: abi:: { ArgAbi , FnAbi , PassMode } ;
@@ -675,7 +675,7 @@ impl<'tcx> GotocCtx<'tcx> {
675
675
fn codegen_alignment_padding (
676
676
& self ,
677
677
size : Size ,
678
- layout : & LayoutS < FieldIdx , VariantIdx > ,
678
+ layout : & LayoutData < FieldIdx , VariantIdx > ,
679
679
idx : usize ,
680
680
) -> Option < DatatypeComponent > {
681
681
let align = Size :: from_bits ( layout. align . abi . bits ( ) ) ;
@@ -700,7 +700,7 @@ impl<'tcx> GotocCtx<'tcx> {
700
700
fn codegen_struct_fields (
701
701
& mut self ,
702
702
flds : Vec < ( String , Ty < ' tcx > ) > ,
703
- layout : & LayoutS < FieldIdx , VariantIdx > ,
703
+ layout : & LayoutData < FieldIdx , VariantIdx > ,
704
704
initial_offset : Size ,
705
705
) -> Vec < DatatypeComponent > {
706
706
match & layout. fields {
@@ -1112,7 +1112,7 @@ impl<'tcx> GotocCtx<'tcx> {
1112
1112
& mut self ,
1113
1113
variant : & VariantDef ,
1114
1114
subst : & ' tcx GenericArgsRef < ' tcx > ,
1115
- layout : & LayoutS < FieldIdx , VariantIdx > ,
1115
+ layout : & LayoutData < FieldIdx , VariantIdx > ,
1116
1116
initial_offset : Size ,
1117
1117
) -> Vec < DatatypeComponent > {
1118
1118
let flds: Vec < _ > =
@@ -1251,7 +1251,7 @@ impl<'tcx> GotocCtx<'tcx> {
1251
1251
// https://github.com/rust-lang/rust/blob/e60ebb2f2c1facba87e7971798f3cbdfd309cd23/compiler/rustc_session/src/code_stats.rs#L166
1252
1252
let max_variant_size = variants
1253
1253
. iter ( )
1254
- . map ( |l : & LayoutS < FieldIdx , VariantIdx > | l. size )
1254
+ . map ( |l : & LayoutData < FieldIdx , VariantIdx > | l. size )
1255
1255
. max ( )
1256
1256
. unwrap ( ) ;
1257
1257
let max_variant_size = std:: cmp:: max ( max_variant_size, discr_offset) ;
@@ -1298,7 +1298,7 @@ impl<'tcx> GotocCtx<'tcx> {
1298
1298
ty : Ty < ' tcx > ,
1299
1299
adtdef : & ' tcx AdtDef ,
1300
1300
subst : & ' tcx GenericArgsRef < ' tcx > ,
1301
- variants : & IndexVec < VariantIdx , LayoutS < FieldIdx , VariantIdx > > ,
1301
+ variants : & IndexVec < VariantIdx , LayoutData < FieldIdx , VariantIdx > > ,
1302
1302
) -> Type {
1303
1303
let non_zst_count = variants. iter ( ) . filter ( |layout| layout. size . bytes ( ) > 0 ) . count ( ) ;
1304
1304
let mangled_name = self . ty_mangled_name ( ty) ;
@@ -1317,7 +1317,7 @@ impl<'tcx> GotocCtx<'tcx> {
1317
1317
1318
1318
pub ( crate ) fn variant_min_offset (
1319
1319
& self ,
1320
- variants : & IndexVec < VariantIdx , LayoutS < FieldIdx , VariantIdx > > ,
1320
+ variants : & IndexVec < VariantIdx , LayoutData < FieldIdx , VariantIdx > > ,
1321
1321
) -> Option < Size > {
1322
1322
variants
1323
1323
. iter ( )
@@ -1407,7 +1407,7 @@ impl<'tcx> GotocCtx<'tcx> {
1407
1407
pretty_name : InternedString ,
1408
1408
def : & ' tcx AdtDef ,
1409
1409
subst : & ' tcx GenericArgsRef < ' tcx > ,
1410
- layouts : & IndexVec < VariantIdx , LayoutS < FieldIdx , VariantIdx > > ,
1410
+ layouts : & IndexVec < VariantIdx , LayoutData < FieldIdx , VariantIdx > > ,
1411
1411
initial_offset : Size ,
1412
1412
) -> Vec < DatatypeComponent > {
1413
1413
def. variants ( )
@@ -1439,7 +1439,7 @@ impl<'tcx> GotocCtx<'tcx> {
1439
1439
pretty_name : InternedString ,
1440
1440
case : & VariantDef ,
1441
1441
subst : & ' tcx GenericArgsRef < ' tcx > ,
1442
- variant : & LayoutS < FieldIdx , VariantIdx > ,
1442
+ variant : & LayoutData < FieldIdx , VariantIdx > ,
1443
1443
initial_offset : Size ,
1444
1444
) -> Type {
1445
1445
let case_name = format ! ( "{name}::{}" , case. name) ;
0 commit comments