Rustup to sty -> kind changes
This commit is contained in:
parent
20b10cc6d3
commit
9fdb347ad7
3 changed files with 5 additions and 5 deletions
|
|
@ -1 +1 @@
|
|||
a5bc0f0e3f0c58518c0537d82dee0fcfeb57115c
|
||||
dc45735f29788924b9fc351d100e5bf3ebdca162
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
|
|||
fn visit_value(&mut self, v: MPlaceTy<'tcx, Tag>) -> InterpResult<'tcx>
|
||||
{
|
||||
trace!("UnsafeCellVisitor: {:?} {:?}", *v, v.layout.ty);
|
||||
let is_unsafe_cell = match v.layout.ty.sty {
|
||||
let is_unsafe_cell = match v.layout.ty.kind {
|
||||
ty::Adt(adt, _) => Some(adt.did) == self.ecx.tcx.lang_items().unsafe_cell_type(),
|
||||
_ => false,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ impl<'tcx> Stacks {
|
|||
|
||||
Stacks {
|
||||
stacks: RefCell::new(RangeMap::new(size, stack)),
|
||||
global: extra,
|
||||
global: extra,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -460,7 +460,7 @@ impl Stacks {
|
|||
pub fn new_allocation(
|
||||
id: AllocId,
|
||||
size: Size,
|
||||
extra: MemoryExtra,
|
||||
extra: MemoryExtra,
|
||||
kind: MemoryKind<MiriMemoryKind>,
|
||||
) -> (Self, Tag) {
|
||||
let (tag, perm) = match kind {
|
||||
|
|
@ -616,7 +616,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
|
|||
// Cannot use `builtin_deref` because that reports *immutable* for `Box`,
|
||||
// making it useless.
|
||||
fn qualify(ty: ty::Ty<'_>, kind: RetagKind) -> Option<(RefKind, bool)> {
|
||||
match ty.sty {
|
||||
match ty.kind {
|
||||
// References are simple.
|
||||
ty::Ref(_, _, MutMutable) =>
|
||||
Some((RefKind::Unique { two_phase: kind == RetagKind::TwoPhase}, kind == RetagKind::FnEntry)),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue