Skip to content

Commit 07f121f

Browse files
committed
Auto merge of #154916 - jhpratt:rollup-RkdDmtW, r=jhpratt
Rollup of 6 pull requests Successful merges: - rust-lang/rust#154627 (Move `rustc_middle::mir::mono` to `rustc_middle::mono`) - rust-lang/rust#154729 (de-non_const some `Iterator` methods) - rust-lang/rust#154891 (implement `StructuralPartialEq` for `MaybeDangling`) - rust-lang/rust#154894 (Slightly refactor mplace<->ptr conversions) - rust-lang/rust#154751 (compiletest: Remove `rfail` support from incremental tests) - rust-lang/rust#154901 (Update books)
2 parents d2d41cf + 30f4944 commit 07f121f

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/borrow_tracker/stacked_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ trait EvalContextPrivExt<'tcx, 'ecx>: crate::MiriInterpCxExt<'tcx> {
859859
info: RetagInfo, // diagnostics info about this retag
860860
) -> InterpResult<'tcx, ImmTy<'tcx>> {
861861
let this = self.eval_context_mut();
862-
let place = this.ref_to_mplace(val)?;
862+
let place = this.imm_ptr_to_mplace(val)?;
863863
let new_place = this.sb_retag_place(&place, new_perm, info)?;
864864
interp_ok(ImmTy::from_immediate(new_place.to_ref(this), val.layout))
865865
}

src/borrow_tracker/tree_borrows/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ trait EvalContextPrivExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
415415
new_perm: NewPermission,
416416
) -> InterpResult<'tcx, ImmTy<'tcx>> {
417417
let this = self.eval_context_mut();
418-
let place = this.ref_to_mplace(val)?;
418+
let place = this.imm_ptr_to_mplace(val)?;
419419
let new_place = this.tb_retag_place(&place, new_perm)?;
420420
interp_ok(ImmTy::from_immediate(new_place.to_ref(this), val.layout))
421421
}

src/shims/panic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
2020
this.call_function(
2121
panic,
2222
ExternAbi::Rust,
23-
&[this.mplace_to_ref(&msg)?],
23+
&[this.mplace_to_imm_ptr(&msg, None)?],
2424
None,
2525
ReturnContinuation::Goto { ret: None, unwind },
2626
)
@@ -39,7 +39,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
3939
this.call_function(
4040
panic,
4141
ExternAbi::Rust,
42-
&[this.mplace_to_ref(&msg)?],
42+
&[this.mplace_to_imm_ptr(&msg, None)?],
4343
None,
4444
ReturnContinuation::Goto { ret: None, unwind: mir::UnwindAction::Unreachable },
4545
)

0 commit comments

Comments
 (0)