Move Const from rustc_middle to rustc_type_ir - #162628
Conversation
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt Some changes occurred in compiler/rustc_sanitizers cc @rcvalle Some changes occurred in match lowering cc @Nadrieril Some changes occurred in match checking cc @Nadrieril
cc @rust-lang/clippy Some changes occurred to the CTFE machinery Some changes occurred in cc @BoxyUwU Some changes occurred in exhaustiveness checking cc @Nadrieril changes to the core type system cc @lcnr Some changes occurred to the CTFE / Miri interpreter cc @rust-lang/miri HIR ty lowering was modified cc @fmease |
rustbot
added
A-LLVM
| // its pointee is valid for the entire lifetime of the target `TyCtxt`. | ||
| unsafe { mem::transmute(self) } | ||
| } | ||
| } |
There was a problem hiding this comment.
why do we need manual impls instead of the macro here again?
There was a problem hiding this comment.
nop_lift does;
assert!(tcx.interners.$set.contains_pointer_to(&InternedInSet(&*self.0.0)));Whereas we need;
assert!(tcx.interners.const_.contains_pointer_to(&InternedInSet(&*self.0)));
|
|
||
| // Things stored inside of tys | ||
| type ErrorGuaranteed: Copy + Debug + Hash + Eq; | ||
| type ErrorGuaranteed: Copy + Debug + Hash + Eq + TypeVisitable<Self>; |
There was a problem hiding this comment.
instead mark with type_visitable(ignored) 🤔
| type Consts: Copy + Debug + Hash + Eq + SliceLike<Item = Const<Self>> + Default; | ||
| type ParamConst: Copy + Debug + Hash + Eq + ParamLike; | ||
| type ValueConst: ValueConst<Self>; | ||
| type ValueConst: ValueConst<Self> + TypeVisitable<Self> + TypeFoldable<Self> + Display; |
There was a problem hiding this comment.
same here
This comment has been minimized.
This comment has been minimized.
| /// cache the type flags and debruijn index on creation and not recompute it | ||
| /// whenever the information is needed. | ||
| #[derive(Copy, Clone, GenericTypeVisitable)] | ||
| #[derive(Copy, Clone, Debug, GenericTypeVisitable)] |
There was a problem hiding this comment.
when do we want to Debug that 🤔 does this PR change the debug output for some types?
There was a problem hiding this comment.
In impl_interner.rs we have;
impl<'tcx> Interner for TyCtxt<'tcx> {
// lots of `type <name> = <concrete>;`
type InternedConstKind = Interned<'tcx, WithCachedTypeInfo<ty::ConstKind<'tcx>>>;And then later in the file have;
impl<'tcx, T: std::fmt::Debug + Clone + Copy> rustc_type_ir::intern::Interned<TyCtxt<'tcx>>
for Interned<'tcx, T>
{
type Value = T;
fn get(self) -> T {
*self.0
}
}Interned has the trait bound Debug. This is because as the InternedConstKind and InternedRegionKind implement Lift which has the trait bound Debug.
As InternedConstKind is different to InternedRegionKind I had to add Debug to WithCachedTypeInfo
There was a problem hiding this comment.
why does that impl have a Debug bound?
There was a problem hiding this comment.
We can get rid of it for trait Interned but trait Lift: std::fmt::Debug and we implement Lift for WithCachedTypeInfo<ConstKind>
This comment has been minimized.
This comment has been minimized.
|
cc @bjorn3
|
63b89a3 to
0e986ed
Compare
|
☔ The latest upstream changes (presumably #162640) made this pull request unmergeable. Please resolve the merge conflicts by rebasing. |
4 participants
Split by commit;
I::Const->Const<I>ConstExtin all places that require the extension trait methods in compilerConstExtin all places that require the extension trait methods in clippyr? @lcnr