mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-27 21:43:37 +00:00
Auto merge of #14316 - HKalbasi:master, r=HKalbasi
Fix stack overflow when derefrencing `&!` fix #14310
This commit is contained in:
commit
9fca0a4afe
4 changed files with 30 additions and 2 deletions
|
@ -146,6 +146,22 @@ fn reference_autoderef() {
|
|||
"#,
|
||||
3,
|
||||
);
|
||||
check_number(
|
||||
r#"
|
||||
struct Foo<T> { x: T }
|
||||
impl<T> Foo<T> {
|
||||
fn foo(&mut self) -> T { self.x }
|
||||
}
|
||||
fn f(i: &mut &mut Foo<Foo<i32>>) -> i32 {
|
||||
((**i).x).foo()
|
||||
}
|
||||
fn g(i: Foo<Foo<i32>>) -> i32 {
|
||||
i.x.foo()
|
||||
}
|
||||
const GOAL: i32 = f(&mut &mut Foo { x: Foo { x: 3 } }) + g(Foo { x: Foo { x: 5 } });
|
||||
"#,
|
||||
8,
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -637,7 +637,7 @@ impl MirLowerCtx<'_> {
|
|||
}
|
||||
Expr::Box { .. } => not_supported!("box expression"),
|
||||
Expr::Field { .. } | Expr::Index { .. } | Expr::UnaryOp { op: hir_def::expr::UnaryOp::Deref, .. } => {
|
||||
let Some((p, current)) = self.lower_expr_as_place(current, expr_id, true)? else {
|
||||
let Some((p, current)) = self.lower_expr_as_place_without_adjust(current, expr_id, true)? else {
|
||||
return Ok(None);
|
||||
};
|
||||
self.push_assignment(current, place, Operand::Copy(p).into(), expr_id.into());
|
||||
|
|
|
@ -110,7 +110,7 @@ impl MirLowerCtx<'_> {
|
|||
}
|
||||
}
|
||||
|
||||
fn lower_expr_as_place_without_adjust(
|
||||
pub(super) fn lower_expr_as_place_without_adjust(
|
||||
&mut self,
|
||||
current: BasicBlockId,
|
||||
expr_id: ExprId,
|
||||
|
|
|
@ -336,6 +336,18 @@ fn main() {
|
|||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn regression_14310() {
|
||||
check_diagnostics(
|
||||
r#"
|
||||
fn clone(mut i: &!) -> ! {
|
||||
//^^^^^ 💡 weak: variable does not need to be mutable
|
||||
*i
|
||||
}
|
||||
"#,
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn match_bindings() {
|
||||
check_diagnostics(
|
||||
|
|
Loading…
Reference in a new issue