rustc: Crawl static initializers for reachability

This ensures that private functions exported through static initializers will
actually end up being public in the object file (so other objects can continue
to reference the function).

Closes #13620
This commit is contained in:
Alex Crichton 2014-05-02 15:40:07 -07:00
parent b5d6b07370
commit 18ac26565f
4 changed files with 52 additions and 1 deletions

View file

@ -270,11 +270,12 @@ impl<'a> ReachableContext<'a> {
// Statics with insignificant addresses are not reachable // Statics with insignificant addresses are not reachable
// because they're inlined specially into all other crates. // because they're inlined specially into all other crates.
ast::ItemStatic(..) => { ast::ItemStatic(_, _, init) => {
if attr::contains_name(item.attrs.as_slice(), if attr::contains_name(item.attrs.as_slice(),
"address_insignificant") { "address_insignificant") {
self.reachable_symbols.remove(&search_item); self.reachable_symbols.remove(&search_item);
} }
visit::walk_expr(self, init, ());
} }
// These are normal, nothing reachable about these // These are normal, nothing reachable about these

View file

@ -0,0 +1,19 @@
// Copyright 2012-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.
pub struct Foo {
pub foo: extern fn()
}
extern fn the_foo() {}
pub static FOO: Foo = Foo {
foo: the_foo
};

View file

@ -0,0 +1,13 @@
// Copyright 2012-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.
extern crate crate1 = "issue-13620-1";
pub static FOO2: crate1::Foo = crate1::FOO;

View file

@ -0,0 +1,18 @@
// Copyright 2012-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.
// aux-build:issue-13620-1.rs
// aux-build:issue-13620-2.rs
extern crate crate2 = "issue-13620-2";
fn main() {
(crate2::FOO2.foo)();
}