Skip to content

Commit 1b40067

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #70616 - anyska:fieldplacement-rename, r=oli-obk
rustc_target::abi: rename FieldPlacement to FieldsShape. Originally suggested by @eddyb.
2 parents b919df2 + f259470 commit 1b40067

File tree

9 files changed

+64
-64
lines changed

9 files changed

+64
-64
lines changed

‎src/librustc_codegen_llvm/type_of.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ fn uncached_llvm_type<'a, 'tcx>(
7979
};
8080

8181
match layout.fields {
82-
layout::FieldPlacement::Union(_) => {
82+
layout::FieldsShape::Union(_) => {
8383
let fill = cx.type_padding_filler(layout.size, layout.align.abi);
8484
let packed = false;
8585
match name {
@@ -91,10 +91,10 @@ fn uncached_llvm_type<'a, 'tcx>(
9191
}
9292
}
9393
}
94-
layout::FieldPlacement::Array { count, .. } => {
94+
layout::FieldsShape::Array { count, .. } => {
9595
cx.type_array(layout.field(cx, 0).llvm_type(cx), count)
9696
}
97-
layout::FieldPlacement::Arbitrary { .. } => match name {
97+
layout::FieldsShape::Arbitrary { .. } => match name {
9898
None => {
9999
let (llfields, packed) = struct_llfields(cx, layout);
100100
cx.type_struct(&llfields, packed)
@@ -371,13 +371,13 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyAndLayout<'tcx> {
371371
_ => {}
372372
}
373373
match self.fields {
374-
layout::FieldPlacement::Union(_) => {
374+
layout::FieldsShape::Union(_) => {
375375
bug!("TyAndLayout::llvm_field_index({:?}): not applicable", self)
376376
}
377377

378-
layout::FieldPlacement::Array { .. } => index as u64,
378+
layout::FieldsShape::Array { .. } => index as u64,
379379

380-
layout::FieldPlacement::Arbitrary { .. } => {
380+
layout::FieldsShape::Arbitrary { .. } => {
381381
1 + (self.fields.memory_index(index) as u64) * 2
382382
}
383383
}

‎src/librustc_codegen_ssa/mir/place.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ impl<'a, 'tcx, V: CodegenObject> PlaceRef<'tcx, V> {
6666
}
6767

6868
pub fn len<Cx: ConstMethods<'tcx, Value = V>>(&self, cx: &Cx) -> V {
69-
if let layout::FieldPlacement::Array { count, .. } = self.layout.fields {
69+
if let layout::FieldsShape::Array { count, .. } = self.layout.fields {
7070
if self.layout.is_unsized() {
7171
assert_eq!(count, 0);
7272
self.llextra.unwrap()

‎src/librustc_middle/ty/layout.rs‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ enum StructKind {
230230
// Invert a bijective mapping, i.e. `invert(map)[y] = x` if `map[x] = y`.
231231
// This is used to go between `memory_index` (source field order to memory order)
232232
// and `inverse_memory_index` (memory order to source field order).
233-
// See also `FieldPlacement::Arbitrary::memory_index` for more details.
233+
// See also `FieldsShape::Arbitrary::memory_index` for more details.
234234
// FIXME(eddyb) build a better abstraction for permutations, if possible.
235235
fn invert_mapping(map: &[u32]) -> Vec<u32> {
236236
let mut inverse = vec![0; map.len()];
@@ -257,7 +257,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
257257

258258
Layout {
259259
variants: Variants::Single { index: VariantIdx::new(0) },
260-
fields: FieldPlacement::Arbitrary {
260+
fields: FieldsShape::Arbitrary {
261261
offsets: vec![Size::ZERO, b_offset],
262262
memory_index: vec![0, 1],
263263
},
@@ -443,7 +443,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
443443
};
444444
let pair = self.scalar_pair(a.clone(), b.clone());
445445
let pair_offsets = match pair.fields {
446-
FieldPlacement::Arbitrary { ref offsets, ref memory_index } => {
446+
FieldsShape::Arbitrary { ref offsets, ref memory_index } => {
447447
assert_eq!(memory_index, &[0, 1]);
448448
offsets
449449
}
@@ -471,7 +471,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
471471

472472
Ok(Layout {
473473
variants: Variants::Single { index: VariantIdx::new(0) },
474-
fields: FieldPlacement::Arbitrary { offsets, memory_index },
474+
fields: FieldsShape::Arbitrary { offsets, memory_index },
475475
abi,
476476
largest_niche,
477477
align,
@@ -520,7 +520,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
520520
// The never type.
521521
ty::Never => tcx.intern_layout(Layout {
522522
variants: Variants::Single { index: VariantIdx::new(0) },
523-
fields: FieldPlacement::Union(0),
523+
fields: FieldsShape::Union(0),
524524
abi: Abi::Uninhabited,
525525
largest_niche: None,
526526
align: dl.i8_align,
@@ -581,7 +581,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
581581

582582
tcx.intern_layout(Layout {
583583
variants: Variants::Single { index: VariantIdx::new(0) },
584-
fields: FieldPlacement::Array { stride: element.size, count },
584+
fields: FieldsShape::Array { stride: element.size, count },
585585
abi,
586586
largest_niche,
587587
align: element.align,
@@ -592,7 +592,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
592592
let element = self.layout_of(element)?;
593593
tcx.intern_layout(Layout {
594594
variants: Variants::Single { index: VariantIdx::new(0) },
595-
fields: FieldPlacement::Array { stride: element.size, count: 0 },
595+
fields: FieldsShape::Array { stride: element.size, count: 0 },
596596
abi: Abi::Aggregate { sized: false },
597597
largest_niche: None,
598598
align: element.align,
@@ -601,7 +601,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
601601
}
602602
ty::Str => tcx.intern_layout(Layout {
603603
variants: Variants::Single { index: VariantIdx::new(0) },
604-
fields: FieldPlacement::Array { stride: Size::from_bytes(1), count: 0 },
604+
fields: FieldsShape::Array { stride: Size::from_bytes(1), count: 0 },
605605
abi: Abi::Aggregate { sized: false },
606606
largest_niche: None,
607607
align: dl.i8_align,
@@ -670,7 +670,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
670670

671671
tcx.intern_layout(Layout {
672672
variants: Variants::Single { index: VariantIdx::new(0) },
673-
fields: FieldPlacement::Array { stride: element.size, count },
673+
fields: FieldsShape::Array { stride: element.size, count },
674674
abi: Abi::Vector { element: scalar, count },
675675
largest_niche: element.largest_niche.clone(),
676676
size,
@@ -746,7 +746,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
746746

747747
return Ok(tcx.intern_layout(Layout {
748748
variants: Variants::Single { index },
749-
fields: FieldPlacement::Union(variants[index].len()),
749+
fields: FieldsShape::Union(variants[index].len()),
750750
abi,
751751
largest_niche: None,
752752
align,
@@ -980,7 +980,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
980980
discr_index: 0,
981981
variants: st,
982982
},
983-
fields: FieldPlacement::Arbitrary {
983+
fields: FieldsShape::Arbitrary {
984984
offsets: vec![offset],
985985
memory_index: vec![0],
986986
},
@@ -1121,7 +1121,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
11211121
let new_ity_size = ity.size();
11221122
for variant in &mut layout_variants {
11231123
match variant.fields {
1124-
FieldPlacement::Arbitrary { ref mut offsets, .. } => {
1124+
FieldsShape::Arbitrary { ref mut offsets, .. } => {
11251125
for i in offsets {
11261126
if *i <= old_ity_size {
11271127
assert_eq!(*i, old_ity_size);
@@ -1151,7 +1151,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
11511151
let mut common_prim = None;
11521152
for (field_layouts, layout_variant) in variants.iter().zip(&layout_variants) {
11531153
let offsets = match layout_variant.fields {
1154-
FieldPlacement::Arbitrary { ref offsets, .. } => offsets,
1154+
FieldsShape::Arbitrary { ref offsets, .. } => offsets,
11551155
_ => bug!(),
11561156
};
11571157
let mut fields =
@@ -1187,7 +1187,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
11871187
if let Some((prim, offset)) = common_prim {
11881188
let pair = self.scalar_pair(tag.clone(), scalar_unit(prim));
11891189
let pair_offsets = match pair.fields {
1190-
FieldPlacement::Arbitrary { ref offsets, ref memory_index } => {
1190+
FieldsShape::Arbitrary { ref offsets, ref memory_index } => {
11911191
assert_eq!(memory_index, &[0, 1]);
11921192
offsets
11931193
}
@@ -1218,7 +1218,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
12181218
discr_index: 0,
12191219
variants: layout_variants,
12201220
},
1221-
fields: FieldPlacement::Arbitrary {
1221+
fields: FieldsShape::Arbitrary {
12221222
offsets: vec![Size::ZERO],
12231223
memory_index: vec![0],
12241224
},
@@ -1435,7 +1435,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
14351435
// GeneratorLayout.
14361436
debug!("prefix = {:#?}", prefix);
14371437
let (outer_fields, promoted_offsets, promoted_memory_index) = match prefix.fields {
1438-
FieldPlacement::Arbitrary { mut offsets, memory_index } => {
1438+
FieldsShape::Arbitrary { mut offsets, memory_index } => {
14391439
let mut inverse_memory_index = invert_mapping(&memory_index);
14401440

14411441
// "a" (`0..b_start`) and "b" (`b_start..`) correspond to
@@ -1458,7 +1458,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
14581458
let memory_index_b = invert_mapping(&inverse_memory_index_b);
14591459

14601460
let outer_fields =
1461-
FieldPlacement::Arbitrary { offsets: offsets_a, memory_index: memory_index_a };
1461+
FieldsShape::Arbitrary { offsets: offsets_a, memory_index: memory_index_a };
14621462
(outer_fields, offsets_b, memory_index_b)
14631463
}
14641464
_ => bug!(),
@@ -1492,7 +1492,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
14921492
variant.variants = Variants::Single { index };
14931493

14941494
let (offsets, memory_index) = match variant.fields {
1495-
FieldPlacement::Arbitrary { offsets, memory_index } => (offsets, memory_index),
1495+
FieldsShape::Arbitrary { offsets, memory_index } => (offsets, memory_index),
14961496
_ => bug!(),
14971497
};
14981498

@@ -1535,7 +1535,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
15351535
combined_inverse_memory_index.retain(|&i| i != INVALID_FIELD_IDX);
15361536
let combined_memory_index = invert_mapping(&combined_inverse_memory_index);
15371537

1538-
variant.fields = FieldPlacement::Arbitrary {
1538+
variant.fields = FieldsShape::Arbitrary {
15391539
offsets: combined_offsets,
15401540
memory_index: combined_memory_index,
15411541
};
@@ -1990,7 +1990,7 @@ where
19901990
if index == variant_index &&
19911991
// Don't confuse variants of uninhabited enums with the enum itself.
19921992
// For more details see https://github.com/rust-lang/rust/issues/69763.
1993-
this.fields != FieldPlacement::Union(0) =>
1993+
this.fields != FieldsShape::Union(0) =>
19941994
{
19951995
this.layout
19961996
}
@@ -2008,7 +2008,7 @@ where
20082008
let tcx = cx.tcx();
20092009
tcx.intern_layout(Layout {
20102010
variants: Variants::Single { index: variant_index },
2011-
fields: FieldPlacement::Union(fields),
2011+
fields: FieldsShape::Union(fields),
20122012
abi: Abi::Uninhabited,
20132013
largest_niche: None,
20142014
align: tcx.data_layout.i8_align,
@@ -2054,7 +2054,7 @@ where
20542054
// Reuse the fat `*T` type as its own thin pointer data field.
20552055
// This provides information about, e.g., DST struct pointees
20562056
// (which may have no non-DST form), and will work as long
2057-
// as the `Abi` or `FieldPlacement` is checked by users.
2057+
// as the `Abi` or `FieldsShape` is checked by users.
20582058
if i == 0 {
20592059
let nil = tcx.mk_unit();
20602060
let ptr_ty = if this.ty.is_unsafe_ptr() {
@@ -2219,7 +2219,7 @@ where
22192219

22202220
if let Some(variant) = data_variant {
22212221
// We're not interested in any unions.
2222-
if let FieldPlacement::Union(_) = variant.fields {
2222+
if let FieldsShape::Union(_) = variant.fields {
22232223
data_variant = None;
22242224
}
22252225
}

‎src/librustc_mir/interpret/place.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl<'tcx, Tag> MPlaceTy<'tcx, Tag> {
219219
// Go through the layout. There are lots of types that support a length,
220220
// e.g., SIMD types.
221221
match self.layout.fields {
222-
layout::FieldPlacement::Array { count, .. } => Ok(count),
222+
layout::FieldsShape::Array { count, .. } => Ok(count),
223223
_ => bug!("len not supported on sized type {:?}", self.layout.ty),
224224
}
225225
}
@@ -437,7 +437,7 @@ where
437437
) -> InterpResult<'tcx, MPlaceTy<'tcx, M::PointerTag>> {
438438
// Not using the layout method because we want to compute on u64
439439
match base.layout.fields {
440-
layout::FieldPlacement::Array { stride, .. } => {
440+
layout::FieldsShape::Array { stride, .. } => {
441441
let len = base.len(self)?;
442442
if index >= len {
443443
// This can only be reached in ConstProp and non-rustc-MIR.
@@ -463,7 +463,7 @@ where
463463
{
464464
let len = base.len(self)?; // also asserts that we have a type where this makes sense
465465
let stride = match base.layout.fields {
466-
layout::FieldPlacement::Array { stride, .. } => stride,
466+
layout::FieldsShape::Array { stride, .. } => stride,
467467
_ => bug!("mplace_array_fields: expected an array layout"),
468468
};
469469
let layout = base.layout.field(self, 0)?;
@@ -493,7 +493,7 @@ where
493493
// Not using layout method because that works with usize, and does not work with slices
494494
// (that have count 0 in their layout).
495495
let from_offset = match base.layout.fields {
496-
layout::FieldPlacement::Array { stride, .. } => stride * from, // `Size` multiplication is checked
496+
layout::FieldsShape::Array { stride, .. } => stride * from, // `Size` multiplication is checked
497497
_ => bug!("Unexpected layout of index access: {:#?}", base.layout),
498498
};
499499

‎src/librustc_mir/interpret/visitor.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ macro_rules! make_value_visitor {
207207

208208
// Visit the fields of this value.
209209
match v.layout().fields {
210-
layout::FieldPlacement::Union(fields) => {
210+
layout::FieldsShape::Union(fields) => {
211211
self.visit_union(v, fields)?;
212212
},
213-
layout::FieldPlacement::Arbitrary { ref offsets, .. } => {
213+
layout::FieldsShape::Arbitrary { ref offsets, .. } => {
214214
// FIXME: We collect in a vec because otherwise there are lifetime
215215
// errors: Projecting to a field needs access to `ecx`.
216216
let fields: Vec<InterpResult<'tcx, Self::V>> =
@@ -220,7 +220,7 @@ macro_rules! make_value_visitor {
220220
.collect();
221221
self.visit_aggregate(v, fields.into_iter())?;
222222
},
223-
layout::FieldPlacement::Array { .. } => {
223+
layout::FieldsShape::Array { .. } => {
224224
// Let's get an mplace first.
225225
let mplace = v.to_op(self.ecx())?.assert_mem_place(self.ecx());
226226
// Now we can go over all the fields.

‎src/librustc_target/abi/call/mips64.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ where
4949
// use of float registers to structures (not unions) containing exactly one or two
5050
// float fields.
5151

52-
if let abi::FieldPlacement::Arbitrary { .. } = ret.layout.fields {
52+
if let abi::FieldsShape::Arbitrary { .. } = ret.layout.fields {
5353
if ret.layout.fields.count() == 1 {
5454
if let Some(reg) = float_reg(cx, ret, 0) {
5555
ret.cast_to(reg);
@@ -88,15 +88,15 @@ where
8888
let mut prefix_index = 0;
8989

9090
match arg.layout.fields {
91-
abi::FieldPlacement::Array { .. } => {
91+
abi::FieldsShape::Array { .. } => {
9292
// Arrays are passed indirectly
9393
arg.make_indirect();
9494
return;
9595
}
96-
abi::FieldPlacement::Union(_) => {
96+
abi::FieldsShape::Union(_) => {
9797
// Unions and are always treated as a series of 64-bit integer chunks
9898
}
99-
abi::FieldPlacement::Arbitrary { .. } => {
99+
abi::FieldsShape::Arbitrary { .. } => {
100100
// Structures are split up into a series of 64-bit integer chunks, but any aligned
101101
// doubles not part of another aggregate are passed as floats.
102102
let mut last_offset = Size::ZERO;

‎src/librustc_target/abi/call/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use crate::abi::{self, Abi, Align, FieldPlacement, Size};
1+
use crate::abi::{self, Abi, Align, FieldsShape, Size};
22
use crate::abi::{HasDataLayout, LayoutOf, TyAndLayout, TyAndLayoutMethods};
33
use crate::spec::{self, HasTargetSpec};
44

@@ -315,7 +315,7 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
315315
start: Size|
316316
-> Result<(HomogeneousAggregate, Size), Heterogeneous> {
317317
let is_union = match layout.fields {
318-
FieldPlacement::Array { count, .. } => {
318+
FieldsShape::Array { count, .. } => {
319319
assert_eq!(start, Size::ZERO);
320320

321321
let result = if count > 0 {
@@ -325,8 +325,8 @@ impl<'a, Ty> TyAndLayout<'a, Ty> {
325325
};
326326
return Ok((result, layout.size));
327327
}
328-
FieldPlacement::Union(_) => true,
329-
FieldPlacement::Arbitrary { .. } => false,
328+
FieldsShape::Union(_) => true,
329+
FieldsShape::Arbitrary { .. } => false,
330330
};
331331

332332
let mut result = HomogeneousAggregate::NoData;

‎src/librustc_target/abi/call/riscv.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use crate::abi::call::{ArgAbi, ArgAttribute, CastTarget, FnAbi, PassMode, Reg, RegKind, Uniform};
88
use crate::abi::{
9-
self, Abi, FieldPlacement, HasDataLayout, LayoutOf, Size, TyAndLayout, TyAndLayoutMethods,
9+
self, Abi, FieldsShape, HasDataLayout, LayoutOf, Size, TyAndLayout, TyAndLayoutMethods,
1010
};
1111
use crate::spec::HasTargetSpec;
1212

@@ -87,12 +87,12 @@ where
8787
},
8888
Abi::Vector { .. } | Abi::Uninhabited => return Err(CannotUseFpConv),
8989
Abi::ScalarPair(..) | Abi::Aggregate { .. } => match arg_layout.fields {
90-
FieldPlacement::Union(_) => {
90+
FieldsShape::Union(_) => {
9191
if !arg_layout.is_zst() {
9292
return Err(CannotUseFpConv);
9393
}
9494
}
95-
FieldPlacement::Array { count, .. } => {
95+
FieldsShape::Array { count, .. } => {
9696
for _ in 0..count {
9797
let elem_layout = arg_layout.field(cx, 0);
9898
should_use_fp_conv_helper(
@@ -105,7 +105,7 @@ where
105105
)?;
106106
}
107107
}
108-
FieldPlacement::Arbitrary { .. } => {
108+
FieldsShape::Arbitrary { .. } => {
109109
match arg_layout.variants {
110110
abi::Variants::Multiple { .. } => return Err(CannotUseFpConv),
111111
abi::Variants::Single { .. } => (),

0 commit comments

Comments
 (0)