mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #6741 : pcwalton/rust/intra-crate-start, r=graydon

Browse Source 
r? @brson
This commit is contained in:
bors 2013-05-27 18:26:04 -07:00
commit 2061ce9aff
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc/middle/trans/base.rs
View File

@ -2339,9 +2339,7 @@ fn create_entry_fn(ccx: @CrateContext,
llvm::LLVMPositionBuilderAtEnd(bld, llbb);
let start_def_id = ccx.tcx.lang_items.start_fn();
if start_def_id.crate == ast::local_crate {
ccx.sess.bug("start lang item is never in the local crate")
} else {
if start_def_id.crate != ast::local_crate {
let start_fn_type = csearch::get_type(ccx.tcx,
start_def_id).ty;
trans_external_path(ccx, start_def_id, start_fn_type);
@ -2358,8 +2356,7 @@ fn create_entry_fn(ccx: @CrateContext,
let (start_fn, args) = if use_start_lang_item {
let start_def_id = ccx.tcx.lang_items.start_fn();
let start_fn = if start_def_id.crate == ast::local_crate {
ccx.sess.bug("start lang item is never in the local \
crate")
get_item_val(ccx, start_def_id.node)
} else {
let start_fn_type = csearch::get_type(ccx.tcx,
start_def_id).ty;