Skip to content

Force all lang items to be reachable #11603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/librustc/middle/reachable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,23 @@ pub fn find_reachable(tcx: ty::ctxt,
let reachable_context = ReachableContext::new(tcx, method_map);

// Step 1: Seed the worklist with all nodes which were found to be public as
// a result of the privacy pass
// a result of the privacy pass along with all local lang items. If
// other crates link to us, they're going to expect to be able to
// use the lang items, so we need to be sure to mark them as
// exported.
let mut worklist = reachable_context.worklist.borrow_mut();
for &id in exported_items.iter() {
let mut worklist = reachable_context.worklist.borrow_mut();
worklist.get().push(id);
}
for (_, item) in tcx.lang_items.items() {
match *item {
Some(did) if is_local(did) => {
worklist.get().push(did.node);
}
_ => {}
}
}
drop(worklist);

// Step 2: Mark all symbols that the symbols on the worklist touch.
reachable_context.propagate();
Expand Down
17 changes: 17 additions & 0 deletions src/test/auxiliary/lang-item-public.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// 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.

#[no_std];

#[lang="fail_"]
fn fail(_: *i8, _: *i8, _: uint) -> ! { loop {} }

#[no_mangle]
pub extern "C" fn rust_stack_exhausted() {}
38 changes: 38 additions & 0 deletions src/test/run-pass/lang-item-public.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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.

// aux-build:lang-item-public.rs
// ignore-fast
// ignore-android

#[no_std];

extern crate lang_lib = "lang-item-public";

#[cfg(target_os = "linux")]
#[link(name = "c")]
extern {}

#[cfg(target_os = "android")]
#[link(name = "c")]
extern {}

#[cfg(target_os = "freebsd")]
#[link(name = "execinfo")]
extern {}

#[cfg(target_os = "macos")]
#[link(name = "System")]
extern {}

#[start]
fn main(_: int, _: **u8) -> int {
1 % 1
}