2021-01-19 19:40:16 +00:00
|
|
|
use super::QueryCtxt;
|
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.
2022-01-25 03:13:38 +00:00
|
|
|
use rustc_middle::ty::{self, AdtSizedConstraint, Ty};
|
2017-09-18 09:40:13 +00:00
|
|
|
|
|
|
|
pub(super) trait Value<'tcx>: Sized {
|
2020-04-08 15:03:34 +00:00
|
|
|
fn from_cycle_error(tcx: QueryCtxt<'tcx>) -> Self;
|
2017-09-18 09:40:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'tcx, T> Value<'tcx> for T {
|
2020-04-08 15:03:34 +00:00
|
|
|
default fn from_cycle_error(tcx: QueryCtxt<'tcx>) -> T {
|
2017-09-18 09:40:13 +00:00
|
|
|
tcx.sess.abort_if_errors();
|
|
|
|
bug!("Value::from_cycle_error called without errors");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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.
2022-01-25 03:13:38 +00:00
|
|
|
impl<'tcx> Value<'tcx> for Ty<'_> {
|
2020-04-08 15:03:34 +00:00
|
|
|
fn from_cycle_error(tcx: QueryCtxt<'tcx>) -> Self {
|
2020-06-01 17:58:18 +00:00
|
|
|
// SAFETY: This is never called when `Self` is not `Ty<'tcx>`.
|
|
|
|
// FIXME: Represent the above fact in the trait system somehow.
|
2020-05-06 04:02:09 +00:00
|
|
|
unsafe { std::mem::transmute::<Ty<'tcx>, Ty<'_>>(tcx.ty_error()) }
|
2017-09-18 09:40:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-10 05:45:05 +00:00
|
|
|
impl<'tcx> Value<'tcx> for ty::SymbolName<'_> {
|
2020-04-08 15:03:34 +00:00
|
|
|
fn from_cycle_error(tcx: QueryCtxt<'tcx>) -> Self {
|
2020-07-10 05:45:05 +00:00
|
|
|
// SAFETY: This is never called when `Self` is not `SymbolName<'tcx>`.
|
|
|
|
// FIXME: Represent the above fact in the trait system somehow.
|
|
|
|
unsafe {
|
|
|
|
std::mem::transmute::<ty::SymbolName<'tcx>, ty::SymbolName<'_>>(ty::SymbolName::new(
|
2020-04-08 15:03:34 +00:00
|
|
|
*tcx, "<error>",
|
2020-07-10 05:45:05 +00:00
|
|
|
))
|
|
|
|
}
|
2017-09-18 09:40:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-01 17:58:18 +00:00
|
|
|
impl<'tcx> Value<'tcx> for AdtSizedConstraint<'_> {
|
2020-04-08 15:03:34 +00:00
|
|
|
fn from_cycle_error(tcx: QueryCtxt<'tcx>) -> Self {
|
2020-06-01 17:58:18 +00:00
|
|
|
// SAFETY: This is never called when `Self` is not `AdtSizedConstraint<'tcx>`.
|
|
|
|
// FIXME: Represent the above fact in the trait system somehow.
|
|
|
|
unsafe {
|
|
|
|
std::mem::transmute::<AdtSizedConstraint<'tcx>, AdtSizedConstraint<'_>>(
|
2020-05-06 04:02:09 +00:00
|
|
|
AdtSizedConstraint(tcx.intern_type_list(&[tcx.ty_error()])),
|
2020-06-01 17:58:18 +00:00
|
|
|
)
|
|
|
|
}
|
2019-01-24 19:05:19 +00:00
|
|
|
}
|
|
|
|
}
|