squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rustc: External fns declared as fns not global variables

Browse source 
Issue #2167
This commit is contained in:
Haitao Li 2012-04-09 14:38:53 +08:00
parent 460b92a37f
commit 46e4aaa0be
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/rustc/middle/trans/base.rs
View file

@ -1772,11 +1772,17 @@ fn lval_no_env(bcx: block, val: ValueRef, kind: lval_kind)
fn trans_external_path(ccx: @crate_ctxt, did: ast::def_id, t: ty::t)
-> ValueRef {
let name = csearch::get_symbol(ccx.sess.cstore, did);
let llty = alt ty::get(t).struct {
ty::ty_fn(_) { type_of_fn_from_ty(ccx, t) }
_ { type_of(ccx, t) }
alt ty::get(t).struct {
ty::ty_fn(_) {
let llty = type_of_fn_from_ty(ccx, t);
ret get_extern_fn(ccx.externs, ccx.llmod, name,
lib::llvm::CCallConv, llty);
}
_ {
let llty = type_of(ccx, t);
ret get_extern_const(ccx.externs, ccx.llmod, name, llty);
}
};
ret get_extern_const(ccx.externs, ccx.llmod, name, llty);
}
fn normalize_for_monomorphization(tcx: ty::ctxt, ty: ty::t) -> option<ty::t> {
@ -4498,6 +4504,7 @@ fn create_main_wrapper(ccx: @crate_ctxt, sp: span, main_llfn: ValueRef,
let start_ty = T_fn([val_ty(rust_main), ccx.int_type, ccx.int_type,
val_ty(crate_map)], ccx.int_type);
let start = decl_cdecl_fn(ccx.llmod, "rust_start", start_ty);
let args = [rust_main, llvm::LLVMGetParam(llfn, 0 as c_uint),
llvm::LLVMGetParam(llfn, 1 as c_uint), crate_map];
let result = unsafe {