Overhaul TyS
and Ty
.
Specifically, change `Ty` from this: ``` pub type Ty<'tcx> = &'tcx TyS<'tcx>; ``` to this ``` pub struct Ty<'tcx>(Interned<'tcx, TyS<'tcx>>); ``` There are two benefits to this. - It's now a first class type, so we can define methods on it. This means we can move a lot of methods away from `TyS`, leaving `TyS` as a barely-used type, which is appropriate given that it's not meant to be used directly. - The uniqueness requirement is now explicit, via the `Interned` type. E.g. the pointer-based `Eq` and `Hash` comes from `Interned`, rather than via `TyS`, which wasn't obvious at all. Much of this commit is boring churn. The interesting changes are in these files: - compiler/rustc_middle/src/arena.rs - compiler/rustc_middle/src/mir/visit.rs - compiler/rustc_middle/src/ty/context.rs - compiler/rustc_middle/src/ty/mod.rs Specifically: - Most mentions of `TyS` are removed. It's very much a dumb struct now; `Ty` has all the smarts. - `TyS` now has `crate` visibility instead of `pub`. - `TyS::make_for_test` is removed in favour of the static `BOOL_TY`, which just works better with the new structure. - The `Eq`/`Ord`/`Hash` impls are removed from `TyS`. `Interned`s impls of `Eq`/`Hash` now suffice. `Ord` is now partly on `Interned` (pointer-based, for the `Equal` case) and partly on `TyS` (contents-based, for the other cases). - There are many tedious sigil adjustments, i.e. adding or removing `*` or `&`. They seem to be unavoidable.
This commit is contained in:
parent
0c2ebbd412
commit
e9a0c429c5
145 changed files with 519 additions and 531 deletions
|
@ -185,9 +185,9 @@ impl<'ll, 'tcx> TypeMap<'ll, 'tcx> {
|
|||
///
|
||||
/// This function is used to remove the temporary metadata
|
||||
/// mapping after we've computed the actual metadata.
|
||||
fn remove_type(&mut self, type_: Ty<'tcx>) {
|
||||
if self.type_to_metadata.remove(type_).is_none() {
|
||||
bug!("type metadata `Ty` '{}' is not in the `TypeMap`!", type_);
|
||||
fn remove_type(&mut self, ty: Ty<'tcx>) {
|
||||
if self.type_to_metadata.remove(&ty).is_none() {
|
||||
bug!("type metadata `Ty` '{}' is not in the `TypeMap`!", ty);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -397,7 +397,7 @@ fn fixed_size_array_metadata<'ll, 'tcx>(
|
|||
bug!("fixed_size_array_metadata() called with non-ty::Array type `{:?}`", array_type)
|
||||
};
|
||||
|
||||
let element_type_metadata = type_metadata(cx, element_type);
|
||||
let element_type_metadata = type_metadata(cx, *element_type);
|
||||
|
||||
return_if_metadata_created_in_meantime!(cx, unique_type_id);
|
||||
|
||||
|
@ -546,7 +546,7 @@ fn subroutine_type_metadata<'ll, 'tcx>(
|
|||
)
|
||||
.chain(
|
||||
// regular arguments
|
||||
signature.inputs().iter().map(|argument_type| Some(type_metadata(cx, argument_type))),
|
||||
signature.inputs().iter().map(|&argument_type| Some(type_metadata(cx, argument_type))),
|
||||
)
|
||||
.collect();
|
||||
|
||||
|
@ -601,7 +601,7 @@ fn slice_type_metadata<'ll, 'tcx>(
|
|||
unique_type_id: UniqueTypeId,
|
||||
) -> MetadataCreationResult<'ll> {
|
||||
let element_type = match slice_type.kind() {
|
||||
ty::Slice(element_type) => element_type,
|
||||
ty::Slice(element_type) => *element_type,
|
||||
ty::Str => cx.tcx.types.u8,
|
||||
_ => {
|
||||
bug!(
|
||||
|
|
|
@ -430,9 +430,9 @@ impl<'ll, 'tcx> DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
|
|||
let t = arg.layout.ty;
|
||||
let t = match t.kind() {
|
||||
ty::Array(ct, _)
|
||||
if (*ct == cx.tcx.types.u8) || cx.layout_of(ct).is_zst() =>
|
||||
if (*ct == cx.tcx.types.u8) || cx.layout_of(*ct).is_zst() =>
|
||||
{
|
||||
cx.tcx.mk_imm_ptr(ct)
|
||||
cx.tcx.mk_imm_ptr(*ct)
|
||||
}
|
||||
_ => t,
|
||||
};
|
||||
|
|
|
@ -1132,8 +1132,8 @@ fn generic_simd_intrinsic<'ll, 'tcx>(
|
|||
|
||||
fn simd_simple_float_intrinsic<'ll, 'tcx>(
|
||||
name: Symbol,
|
||||
in_elem: &::rustc_middle::ty::TyS<'_>,
|
||||
in_ty: &::rustc_middle::ty::TyS<'_>,
|
||||
in_elem: Ty<'_>,
|
||||
in_ty: Ty<'_>,
|
||||
in_len: u64,
|
||||
bx: &mut Builder<'_, 'll, 'tcx>,
|
||||
span: Span,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue