Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix autoborrowing when coercing to a mutable raw pointer #86647

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use rustc_hir::{ExprKind, GenericArg, Node, QPath, TyKind};
use rustc_infer::infer::canonical::{Canonical, OriginalQueryValues, QueryResponse};
use rustc_infer::infer::error_reporting::TypeAnnotationNeeded::E0282;
use rustc_infer::infer::{InferOk, InferResult};
use rustc_middle::mir::Mutability;
use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability};
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::subst::{
Expand Down Expand Up @@ -282,7 +283,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
matches!(
adj,
&Adjustment {
kind: Adjust::Borrow(AutoBorrow::Ref(_, AutoBorrowMutability::Mut { .. })),
kind: Adjust::Borrow(
AutoBorrow::Ref(_, AutoBorrowMutability::Mut { .. })
| AutoBorrow::RawPtr(Mutability::Mut)
),
..
}
)
Expand Down
20 changes: 20 additions & 0 deletions src/test/ui/coercion/issue-86262-autoborrow-mut-ptr.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Regression test for #86262. Previously, the code below would incorrectly
// give E0596 (cannot borrow `this.slot` as mutable) because autoborrowing
// did not handle coercions to mutable raw pointers correctly.

// check-pass
#![crate_type="lib"]
#![allow(unused_mut)]

use std::mem::ManuallyDrop;

pub struct RefWrapper<'a, T: ?Sized> {
slot: &'a mut T,
}

impl<'a, T: ?Sized> RefWrapper<'a, T> {
pub fn into_raw(this: Self) -> *mut T {
let mut this = ManuallyDrop::new(this);
this.slot as *mut T /* location of former error */
}
}