From 41e7924670aefe4c39dd4a060452eb623854fde9 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Thu, 5 Sep 2013 02:22:06 +0200 Subject: [PATCH 1/2] Fix #7740: gather_loans should not recur into the items of the block. gather_loans does not need to recurse into any items declared in the current block. Rather than special-case `fk_item_fn` and `fk_method`, just make the GatherLoanVisitor's visit_item method a no-op. This indirectly implies that the example of #7740 is fixed: fn f() { static A: &'static char = &'A'; } Since we do not recurse into items, we no longer encounter `&'A'`. --- src/librustc/middle/borrowck/gather_loans/mod.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/librustc/middle/borrowck/gather_loans/mod.rs b/src/librustc/middle/borrowck/gather_loans/mod.rs index be033de4e41..352a229633b 100644 --- a/src/librustc/middle/borrowck/gather_loans/mod.rs +++ b/src/librustc/middle/borrowck/gather_loans/mod.rs @@ -95,6 +95,11 @@ impl visit::Visitor<@mut GatherLoanCtxt> for GatherLoanVisitor { fn visit_local(&mut self, l:@Local, e:@mut GatherLoanCtxt) { gather_loans_in_local(self, l, e); } + + // #7740: Do not visit items here, not even fn items nor methods + // of impl items; the outer loop in borrowck/mod will visit them + // for us in turn. Thus override visit_item's walk with a no-op. + fn visit_item(&mut self, _:@ast::item, _:@mut GatherLoanCtxt) { } } pub fn gather_loans(bccx: @BorrowckCtxt, @@ -135,10 +140,8 @@ fn gather_loans_in_fn(v: &mut GatherLoanVisitor, id: ast::NodeId, this: @mut GatherLoanCtxt) { match fk { - // Do not visit items here, the outer loop in borrowck/mod - // will visit them for us in turn. &visit::fk_item_fn(*) | &visit::fk_method(*) => { - return; + fail!("cannot occur, due to visit_item override"); } // Visit closures as part of the containing item. From c7352e6403331b0464d1b1e1ccfc9a0f7b67e50b Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Thu, 5 Sep 2013 09:25:29 +0200 Subject: [PATCH 2/2] regression test for #7740. --- src/test/run-pass/borrowck-static-item-in-fn.rs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/test/run-pass/borrowck-static-item-in-fn.rs diff --git a/src/test/run-pass/borrowck-static-item-in-fn.rs b/src/test/run-pass/borrowck-static-item-in-fn.rs new file mode 100644 index 00000000000..a3a7a1b8969 --- /dev/null +++ b/src/test/run-pass/borrowck-static-item-in-fn.rs @@ -0,0 +1,15 @@ +// Copyright 2013 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Regression test for issue #7740 + +fn main() { + static A: &'static char = &'A'; +}