bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/layout/adt.rs')
-rw-r--r--crates/hir-ty/src/layout/adt.rs46
1 files changed, 32 insertions, 14 deletions
diff --git a/crates/hir-ty/src/layout/adt.rs b/crates/hir-ty/src/layout/adt.rs
index 3f310c26ec..2fa01b6b41 100644
--- a/crates/hir-ty/src/layout/adt.rs
+++ b/crates/hir-ty/src/layout/adt.rs
@@ -4,10 +4,10 @@ use std::{cmp, ops::Bound};
use hir_def::{
AdtId, VariantId,
- layout::{Integer, ReprOptions, TargetDataLayout},
signatures::{StructFlags, VariantFields},
};
use intern::sym;
+use rustc_abi::{Integer, ReprOptions, TargetDataLayout};
use rustc_index::IndexVec;
use smallvec::SmallVec;
use triomphe::Arc;
@@ -15,17 +15,26 @@ use triomphe::Arc;
use crate::{
Substitution, TraitEnvironment,
db::HirDatabase,
- layout::{Layout, LayoutError, field_ty},
+ layout::{Layout, LayoutCx, LayoutError, field_ty},
+ next_solver::{DbInterner, GenericArgs, mapping::ChalkToNextSolver},
};
-use super::LayoutCx;
-
pub fn layout_of_adt_query(
db: &dyn HirDatabase,
def: AdtId,
subst: Substitution,
trait_env: Arc<TraitEnvironment>,
) -> Result<Arc<Layout>, LayoutError> {
+ let interner = DbInterner::new_with(db, Some(trait_env.krate), trait_env.block);
+ db.layout_of_adt_ns(def, subst.to_nextsolver(interner), trait_env)
+}
+
+pub fn layout_of_adt_ns_query<'db>(
+ db: &'db dyn HirDatabase,
+ def: AdtId,
+ args: GenericArgs<'db>,
+ trait_env: Arc<TraitEnvironment>,
+) -> Result<Arc<Layout>, LayoutError> {
let krate = trait_env.krate;
let Ok(target) = db.target_data_layout(krate) else {
return Err(LayoutError::TargetLayoutNotAvailable);
@@ -35,7 +44,7 @@ pub fn layout_of_adt_query(
let handle_variant = |def: VariantId, var: &VariantFields| {
var.fields()
.iter()
- .map(|(fd, _)| db.layout_of_ty(field_ty(db, def, fd, &subst), trait_env.clone()))
+ .map(|(fd, _)| db.layout_of_ty_ns(field_ty(db, def, fd, &args), trait_env.clone()))
.collect::<Result<Vec<_>, _>>()
};
let (variants, repr, is_special_no_niche) = match def {
@@ -96,6 +105,24 @@ pub fn layout_of_adt_query(
Ok(Arc::new(result))
}
+pub(crate) fn layout_of_adt_cycle_result(
+ _: &dyn HirDatabase,
+ _: AdtId,
+ _: Substitution,
+ _: Arc<TraitEnvironment>,
+) -> Result<Arc<Layout>, LayoutError> {
+ Err(LayoutError::RecursiveTypeWithoutIndirection)
+}
+
+pub(crate) fn layout_of_adt_ns_cycle_result<'db>(
+ _: &'db dyn HirDatabase,
+ _def: AdtId,
+ _args: GenericArgs<'db>,
+ _trait_env: Arc<TraitEnvironment>,
+) -> Result<Arc<Layout>, LayoutError> {
+ Err(LayoutError::RecursiveTypeWithoutIndirection)
+}
+
fn layout_scalar_valid_range(db: &dyn HirDatabase, def: AdtId) -> (Bound<u128>, Bound<u128>) {
let attrs = db.attrs(def.into());
let get = |name| {
@@ -120,15 +147,6 @@ fn layout_scalar_valid_range(db: &dyn HirDatabase, def: AdtId) -> (Bound<u128>,
(get(sym::rustc_layout_scalar_valid_range_start), get(sym::rustc_layout_scalar_valid_range_end))
}
-pub(crate) fn layout_of_adt_cycle_result(
- _: &dyn HirDatabase,
- _: AdtId,
- _: Substitution,
- _: Arc<TraitEnvironment>,
-) -> Result<Arc<Layout>, LayoutError> {
- Err(LayoutError::RecursiveTypeWithoutIndirection)
-}
-
/// Finds the appropriate Integer type and signedness for the given
/// signed discriminant range and `#[repr]` attribute.
/// N.B.: `u128` values above `i128::MAX` will be treated as signed, but