nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-27 14:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update miri

Browse Source
This commit is contained in:
Maybe Waffle 2022-10-27 19:10:33 +04:00
parent dc53c8f25f
commit c8c4971073
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/miri/src/stacked_borrows/mod.rs
View File

@ -16,7 +16,6 @@ use rustc_middle::ty::{
layout::{HasParamEnv, LayoutOf}, layout::{HasParamEnv, LayoutOf},
Ty, Ty,
}; };
use rustc_span::DUMMY_SP;
use rustc_target::abi::Abi; use rustc_target::abi::Abi;
use rustc_target::abi::Size; use rustc_target::abi::Size;
use smallvec::SmallVec; use smallvec::SmallVec;
@ -714,12 +713,12 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
let mut kind_str = format!("{kind}"); let mut kind_str = format!("{kind}");
match kind { match kind {
RefKind::Unique { two_phase: false } RefKind::Unique { two_phase: false }
if !ty.is_unpin(this.tcx.at(DUMMY_SP), this.param_env()) => if !ty.is_unpin(*this.tcx, this.param_env()) =>
{ {
write!(kind_str, " (!Unpin pointee type {ty})").unwrap() write!(kind_str, " (!Unpin pointee type {ty})").unwrap()
}, },
RefKind::Shared RefKind::Shared
if !ty.is_freeze(this.tcx.at(DUMMY_SP), this.param_env()) => if !ty.is_freeze(*this.tcx, this.param_env()) =>
{ {
write!(kind_str, " (!Freeze pointee type {ty})").unwrap() write!(kind_str, " (!Freeze pointee type {ty})").unwrap()
}, },
@ -834,7 +833,7 @@ trait EvalContextPrivExt<'mir: 'ecx, 'tcx: 'mir, 'ecx>: crate::MiriInterpCxExt<'
// There could be existing unique pointers reborrowed from them that should remain valid! // There could be existing unique pointers reborrowed from them that should remain valid!
let perm = match kind { let perm = match kind {
RefKind::Unique { two_phase: false } RefKind::Unique { two_phase: false }
if place.layout.ty.is_unpin(this.tcx.at(DUMMY_SP), this.param_env()) => if place.layout.ty.is_unpin(*this.tcx, this.param_env()) =>
{ {
// Only if the type is unpin do we actually enforce uniqueness // Only if the type is unpin do we actually enforce uniqueness
Permission::Unique Permission::Unique