auto merge of #14536 : zwarich/rust/issue-14498, r=luqmana
Make check_for_assignment_to_restricted_or_frozen_location treat mutation through an owning pointer the same way it treats mutation through an &mut pointer, where mutability must be inherited from the base path. I also included GC pointers in this check, as that is what the corresponding code in gather_loans/restrictions.rs does, but I don't think there is a way to test this with the current language. Fixes #14498.
This commit is contained in:
commit
e5e865b804
|
@ -641,6 +641,8 @@ impl<'a> CheckLoanCtxt<'a> {
|
|||
// with inherited mutability and with `&mut`
|
||||
// pointers.
|
||||
LpExtend(ref lp_base, mc::McInherited, _) |
|
||||
LpExtend(ref lp_base, _, LpDeref(mc::OwnedPtr)) |
|
||||
LpExtend(ref lp_base, _, LpDeref(mc::GcPtr)) |
|
||||
LpExtend(ref lp_base, _, LpDeref(mc::BorrowedPtr(ty::MutBorrow, _))) => {
|
||||
lp_base.clone()
|
||||
}
|
||||
|
|
|
@ -0,0 +1,63 @@
|
|||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// This tests that we can't modify Box<&mut T> contents while they
|
||||
// are borrowed.
|
||||
|
||||
struct A { a: int }
|
||||
struct B<'a> { a: Box<&'a mut int> }
|
||||
|
||||
fn borrow_in_var_from_var() {
|
||||
let mut x: int = 1;
|
||||
let y = box &mut x;
|
||||
let p = &y;
|
||||
let q = &***p;
|
||||
**y = 2; //~ ERROR cannot assign to `**y` because it is borrowed
|
||||
drop(p);
|
||||
drop(q);
|
||||
}
|
||||
|
||||
fn borrow_in_var_from_field() {
|
||||
let mut x = A { a: 1 };
|
||||
let y = box &mut x.a;
|
||||
let p = &y;
|
||||
let q = &***p;
|
||||
**y = 2; //~ ERROR cannot assign to `**y` because it is borrowed
|
||||
drop(p);
|
||||
drop(q);
|
||||
}
|
||||
|
||||
fn borrow_in_field_from_var() {
|
||||
let mut x: int = 1;
|
||||
let y = B { a: box &mut x };
|
||||
let p = &y.a;
|
||||
let q = &***p;
|
||||
**y.a = 2; //~ ERROR cannot assign to `**y.a` because it is borrowed
|
||||
drop(p);
|
||||
drop(q);
|
||||
}
|
||||
|
||||
fn borrow_in_field_from_field() {
|
||||
let mut x = A { a: 1 };
|
||||
let y = B { a: box &mut x.a };
|
||||
let p = &y.a;
|
||||
let q = &***p;
|
||||
**y.a = 2; //~ ERROR cannot assign to `**y.a` because it is borrowed
|
||||
drop(p);
|
||||
drop(q);
|
||||
}
|
||||
|
||||
fn main() {
|
||||
borrow_in_var_from_var();
|
||||
borrow_in_var_from_field();
|
||||
borrow_in_field_from_var();
|
||||
borrow_in_field_from_field();
|
||||
}
|
||||
|
Loading…
Reference in New Issue