Layout.PointeeInfo

Author: Dante-Broggi

src/librustc/ty/layout.rs

@@ -2205,8 +2205,7 @@ where
             ty::RawPtr(mt) if offset.bytes() == 0 => {
                 cx.layout_of(mt.ty).to_result().ok()
                     .map(|layout| PointeeInfo {
-                        size: layout.pref_pos.size,
-                        align: layout.pref_pos.align.abi,
+                        mem_pos: layout.pref_pos.mem_pos(),
                         safe: None,
                     })
             }
@@ -2244,8 +2243,7 @@ where
 
                 cx.layout_of(ty).to_result().ok()
                     .map(|layout| PointeeInfo {
-                        size: layout.pref_pos.size,
-                        align: layout.pref_pos.align.abi,
+                        mem_pos: layout.pref_pos.mem_pos(),
                         safe: Some(kind),
                     })
             }
@@ -2681,8 +2679,8 @@ where
 
             if let Some(pointee) = layout.pointee_info_at(cx, offset) {
                 if let Some(kind) = pointee.safe {
-                    attrs.pointee_size = pointee.size;
-                    attrs.pointee_align = Some(pointee.align);
+                    attrs.pointee_size = pointee.mem_pos.size;
+                    attrs.pointee_align = Some(pointee.mem_pos.align);
 
                     // `Box` pointer parameters never alias because ownership is transferred
                     // `&mut` pointer parameters never alias other parameters,

src/librustc_codegen_llvm/type_of.rs

@@ -306,7 +306,7 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyLayout<'tcx> {
             layout::Pointer => {
                 // If we know the alignment, pick something better than i8.
                 let pointee = if let Some(pointee) = self.pointee_info_at(cx, offset) {
-                    cx.type_pointee_for_align(pointee.align)
+                    cx.type_pointee_for_align(pointee.mem_pos.align)
                 } else {
                     cx.type_i8()
                 };

src/librustc_target/abi/mod.rs

@@ -1282,8 +1282,7 @@ pub enum PointerKind {
 
 #[derive(Copy, Clone)]
 pub struct PointeeInfo {
-    pub size: Size,
-    pub align: Align,
+    pub mem_pos: MemoryPosition,
     pub safe: Option<PointerKind>,
 }