bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address Alex’s comments

Browse source
This commit is contained in:
Simonas Kazlauskas 2015-03-04 11:46:55 +02:00
parent 8943709221
commit d8d59a954f
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/librustc_trans/trans/base.rs
View file

@ -2127,20 +2127,19 @@ pub fn is_entry_fn(sess: &Session, node_id: ast::NodeId) -> bool {
/// Create the `main` function which will initialise the rust runtime and call users’ main /// Create the `main` function which will initialise the rust runtime and call users’ main
/// function. /// function.
pub fn create_entry_wrapper(ccx: &CrateContext, pub fn create_entry_wrapper(ccx: &CrateContext,
_sp: Span, sp: Span,
main_llfn: ValueRef) { main_llfn: ValueRef) {
let et = ccx.sess().entry_type.get().unwrap(); let et = ccx.sess().entry_type.get().unwrap();
match et { match et {
config::EntryMain => { config::EntryMain => {
create_entry_fn(ccx, _sp, main_llfn, true); create_entry_fn(ccx, sp, main_llfn, true);
} }
config::EntryStart => create_entry_fn(ccx, _sp, main_llfn, false), config::EntryStart => create_entry_fn(ccx, sp, main_llfn, false),
config::EntryNone => {} // Do nothing. config::EntryNone => {} // Do nothing.
} }
#[inline(never)]
fn create_entry_fn(ccx: &CrateContext, fn create_entry_fn(ccx: &CrateContext,
_sp: Span, sp: Span,
rust_main: ValueRef, rust_main: ValueRef,
use_start_lang_item: bool) { use_start_lang_item: bool) {
let llfty = Type::func(&[ccx.int_type(), Type::i8p(ccx).ptr_to()], let llfty = Type::func(&[ccx.int_type(), Type::i8p(ccx).ptr_to()],
@ -2148,7 +2147,7 @@ pub fn create_entry_wrapper(ccx: &CrateContext,
let llfn = declare::define_cfn(ccx, "main", llfty, let llfn = declare::define_cfn(ccx, "main", llfty,
ty::mk_nil(ccx.tcx())).unwrap_or_else(||{ ty::mk_nil(ccx.tcx())).unwrap_or_else(||{
ccx.sess().span_err(_sp, "entry symbol `main` defined multiple times"); ccx.sess().span_err(sp, "entry symbol `main` defined multiple times");
// FIXME: We should be smart and show a better diagnostic here. // FIXME: We should be smart and show a better diagnostic here.
ccx.sess().help("did you use #[no_mangle] on `fn main`? Use #[start] instead"); ccx.sess().help("did you use #[no_mangle] on `fn main`? Use #[start] instead");
ccx.sess().abort_if_errors(); ccx.sess().abort_if_errors();

2
src/librustc_trans/trans/declare.rs
View file

@ -19,8 +19,6 @@
//! ValueRef they return. //! ValueRef they return.
//! * Use define_* family of methods when you might be defining the ValueRef. //! * Use define_* family of methods when you might be defining the ValueRef.
//! * When in doubt, define. //! * When in doubt, define.
#![allow(dead_code)]
use llvm::{self, ValueRef}; use llvm::{self, ValueRef};
use middle::ty::{self, ClosureTyper}; use middle::ty::{self, ClosureTyper};
use syntax::abi; use syntax::abi;