OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for borrow of local variable introduced within static block. 

(Rather than ICE on it.)

Fix #18118.
This commit is contained in:
Felix S. Klock II 2014-10-17 18:15:50 +02:00
parent 93e589c872
commit 88de96178f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc/middle/check_static.rs
View File

@ -57,6 +57,7 @@ struct GlobalChecker {
static_consumptions: NodeSet,
const_borrows: NodeSet,
static_interior_borrows: NodeSet,
static_local_borrows: NodeSet,
}
pub fn check_crate(tcx: &ty::ctxt) {
@ -64,6 +65,7 @@ pub fn check_crate(tcx: &ty::ctxt) {
static_consumptions: NodeSet::new(),
const_borrows: NodeSet::new(),
static_interior_borrows: NodeSet::new(),
static_local_borrows: NodeSet::new(),
};
{
let visitor = euv::ExprUseVisitor::new(&mut checker, tcx);
@ -200,6 +202,14 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckStaticVisitor<'a, 'tcx> {
}
}
// local variables in a block expression in a static context (i.e. being
// assigned to a static variable) cannot be borrowed.
if self.checker.static_local_borrows.remove(&e.id) {
self.tcx.sess.span_err(e.span, "cannot borrow a local variable inside \
a static block, define a separate static \
instead");
}
match e.node {
ast::ExprAddrOf(ast::MutMutable, _) => {
if self.mode != InStaticMut {
@ -298,8 +308,12 @@ impl euv::Delegate for GlobalChecker {
mc::cat_downcast(..) |
mc::cat_discr(..) |
mc::cat_upvar(..) |
mc::cat_local(..) => unreachable!(),
mc::cat_upvar(..) => unreachable!(),
mc::cat_local(..) => {
self.static_local_borrows.insert(borrow_id);
break
}
}
}
}