@@ -16,7 +16,6 @@ use rustc_middle::ty::{
16
16
layout:: { HasParamEnv , LayoutOf } ,
17
17
Ty ,
18
18
} ;
19
- use rustc_span:: DUMMY_SP ;
20
19
use rustc_target:: abi:: Abi ;
21
20
use rustc_target:: abi:: Size ;
22
21
use smallvec:: SmallVec ;
@@ -714,12 +713,12 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
714
713
let mut kind_str = format ! ( "{kind}" ) ;
715
714
match kind {
716
715
RefKind :: Unique { two_phase : false }
717
- if !ty. is_unpin ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
716
+ if !ty. is_unpin ( * this. tcx , this. param_env ( ) ) =>
718
717
{
719
718
write ! ( kind_str, " (!Unpin pointee type {ty})" ) . unwrap ( )
720
719
} ,
721
720
RefKind :: Shared
722
- if !ty. is_freeze ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
721
+ if !ty. is_freeze ( * this. tcx , this. param_env ( ) ) =>
723
722
{
724
723
write ! ( kind_str, " (!Freeze pointee type {ty})" ) . unwrap ( )
725
724
} ,
@@ -834,7 +833,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
834
833
// There could be existing unique pointers reborrowed from them that should remain valid!
835
834
let perm = match kind {
836
835
RefKind :: Unique { two_phase : false }
837
- if place. layout . ty . is_unpin ( this. tcx . at ( DUMMY_SP ) , this. param_env ( ) ) =>
836
+ if place. layout . ty . is_unpin ( * this. tcx , this. param_env ( ) ) =>
838
837
{
839
838
// Only if the type is unpin do we actually enforce uniqueness
840
839
Permission :: Unique
0 commit comments