[squash later] ad-hoc fields for default_address_space_info

Author: xdoardo

compiler/rustc_abi/src/lib.rs

@@ -253,12 +253,14 @@ pub struct TargetDataLayout {
     pub vector_align: Vec<(Size, AbiAlign)>,
 
     pub default_address_space: AddressSpace,
+    pub default_address_space_info: AddressSpaceInfo,
 
     /// The address space informations relative to all the known address spaces.
     ///
     /// # Note
-    /// The first item (`address_space_info[0]`) in the vector should always be the informations
-    /// related to the default address space.
+    ///
+    /// This vector does not contain the [`AddressSpaceInfo`] relative to the default address space,
+    /// which instead lives in [`Self::default_address_space_info`].
     address_space_info: Vec<(AddressSpace, AddressSpaceInfo)>,
 
     pub instruction_address_space: AddressSpace,
@@ -291,14 +293,12 @@ impl Default for TargetDataLayout {
                 (Size::from_bits(128), AbiAlign::new(align(128))),
             ],
             default_address_space: AddressSpace::ZERO,
-            address_space_info: vec![(
-                AddressSpace::ZERO,
-                AddressSpaceInfo {
-                    pointer_size: Size::from_bits(64),
-                    pointer_align: AbiAlign::new(align(64)),
-                    pointer_index: Size::from_bits(64),
-                },
-            )],
+            default_address_space_info: AddressSpaceInfo {
+                pointer_size: Size::from_bits(64),
+                pointer_align: AbiAlign::new(align(64)),
+                pointer_index: Size::from_bits(64),
+            },
+            address_space_info: vec![],
             instruction_address_space: AddressSpace::ZERO,
             c_enum_min_size: Integer::I32,
         }
@@ -313,7 +313,6 @@ pub enum TargetDataLayoutErrors<'a> {
     InconsistentTargetArchitecture { dl: &'a str, target: &'a str },
     InconsistentTargetPointerWidth { pointer_size: u64, target: u32 },
     InvalidBitsSize { err: String },
-    MissingAddressSpaceInfo { addr_space: AddressSpace },
 }
 
 impl TargetDataLayout {
@@ -395,12 +394,12 @@ impl TargetDataLayout {
                         pointer_size,
                         pointer_align: parse_align(a, p)?,
                     };
-                    match dl.address_space_info.iter_mut().find(|(a, _)| *a == addr_space) {
-                        Some(e) => e.1 = info,
-                        None => {
-                            if addr_space == default_address_space {
-                                dl.address_space_info.insert(0, (addr_space, info));
-                            } else {
+                    if addr_space == default_address_space {
+                        dl.default_address_space_info = info;
+                    } else {
+                        match dl.address_space_info.iter_mut().find(|(a, _)| *a == addr_space) {
+                            Some(e) => e.1 = info,
+                            None => {
                                 dl.address_space_info.push((addr_space, info));
                             }
                         }
@@ -423,12 +422,12 @@ impl TargetDataLayout {
                         pointer_index: parse_size(i, p)?,
                     };
 
-                    match dl.address_space_info.iter_mut().find(|(a, _)| *a == addr_space) {
-                        Some(e) => e.1 = info,
-                        None => {
-                            if addr_space == default_address_space {
-                                dl.address_space_info.insert(0, (addr_space, info));
-                            } else {
+                    if addr_space == default_address_space {
+                        dl.default_address_space_info = info;
+                    } else {
+                        match dl.address_space_info.iter_mut().find(|(a, _)| *a == addr_space) {
+                            Some(e) => e.1 = info,
+                            None => {
                                 dl.address_space_info.push((addr_space, info));
                             }
                         }
@@ -470,26 +469,17 @@ impl TargetDataLayout {
             }
         }
 
-        if dl.address_space_info.iter().find(|(a, _)| *a == default_address_space).is_none() {
-            return Err(TargetDataLayoutErrors::MissingAddressSpaceInfo {
-                addr_space: default_address_space,
-            });
-        }
-
         // Inherit, if not given, address space informations for specific LLVM elements from the
         // default data address space.
-
-        if dl.address_space_info.iter().find(|(a, _)| *a == dl.instruction_address_space).is_none()
+        if (dl.instruction_address_space != dl.default_address_space)
+            && dl
+                .address_space_info
+                .iter()
+                .find(|(a, _)| *a == dl.instruction_address_space)
+                .is_none()
         {
-            dl.address_space_info.push((
-                dl.instruction_address_space,
-                dl.address_space_info
-                    .iter()
-                    .find(|(a, _)| *a == default_address_space)
-                    .unwrap()
-                    .1
-                    .clone(),
-            ));
+            dl.address_space_info
+                .push((dl.instruction_address_space, dl.default_address_space_info.clone()));
         }
 
         Ok(dl)
@@ -576,12 +566,16 @@ impl TargetDataLayout {
     /// Get the pointer size in the default data address space.
     #[inline]
     pub fn pointer_size(&self) -> Size {
-        self.address_space_info[0].1.pointer_size
+        self.default_address_space_info.pointer_size
     }
 
     /// Get the pointer size in a specific address space.
     #[inline]
     pub fn pointer_size_in(&self, c: AddressSpace) -> Size {
+        if c == self.default_address_space {
+            return self.default_address_space_info.pointer_size;
+        }
+
         if let Some(e) = self.address_space_info.iter().find(|(a, _)| a == &c) {
             e.1.pointer_size
         } else {
@@ -592,12 +586,16 @@ impl TargetDataLayout {
     /// Get the pointer index in the default data address space.
     #[inline]
     pub fn pointer_index(&self) -> Size {
-        self.address_space_info[0].1.pointer_index
+        self.default_address_space_info.pointer_index
     }
 
     /// Get the pointer index in a specific address space.
     #[inline]
     pub fn pointer_index_in(&self, c: AddressSpace) -> Size {
+        if c == self.default_address_space {
+            return self.default_address_space_info.pointer_index;
+        }
+
         if let Some(e) = self.address_space_info.iter().find(|(a, _)| a == &c) {
             e.1.pointer_index
         } else {
@@ -608,12 +606,16 @@ impl TargetDataLayout {
     /// Get the pointer alignment in the default data address space.
     #[inline]
     pub fn pointer_align(&self) -> AbiAlign {
-        self.address_space_info[0].1.pointer_align
+        self.default_address_space_info.pointer_align
     }
 
     /// Get the pointer alignment in a specific address space.
     #[inline]
     pub fn pointer_align_in(&self, c: AddressSpace) -> AbiAlign {
+        if c == self.default_address_space {
+            return self.default_address_space_info.pointer_align;
+        }
+
         if let Some(e) = self.address_space_info.iter().find(|(a, _)| a == &c) {
             e.1.pointer_align
         } else {

compiler/rustc_errors/messages.ftl

@@ -41,8 +41,5 @@ errors_target_invalid_bits =
 
 errors_target_invalid_bits_size = {$err}
 
-errors_target_missing_addr_space_info =
-    missing address space info for address space `{$addr_space}` in "data-layout"
-
 errors_target_missing_alignment =
     missing alignment for `{$cause}` in "data-layout"

compiler/rustc_errors/src/diagnostic_impls.rs

@@ -374,10 +374,6 @@ impl<G: EmissionGuarantee> Diagnostic<'_, G> for TargetDataLayoutErrors<'_> {
             TargetDataLayoutErrors::InvalidBitsSize { err } => {
                 Diag::new(dcx, level, fluent::errors_target_invalid_bits_size).with_arg("err", err)
             }
-            TargetDataLayoutErrors::MissingAddressSpaceInfo { addr_space } => {
-                Diag::new(dcx, level, fluent::errors_target_missing_addr_space_info)
-                    .with_arg("addr_space", addr_space.0)
-            }
         }
     }
 }

src/tools/rust-analyzer/crates/hir-ty/src/layout/target.rs

@@ -39,8 +39,6 @@ pub fn target_data_layout_query(
                         target,
                     } => format!(r#"inconsistent target specification: "data-layout" claims pointers are {pointer_size}-bit, while "target-pointer-width" is `{target}`"#),
                     TargetDataLayoutErrors::InvalidBitsSize { err } => err,
-                    TargetDataLayoutErrors::MissingAddressSpaceInfo { addr_space } =>
-                        format!(r#"missing address space info for address space {addr_space:?}` in "data-layout""#)
                 }.into())
             }
         },