bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

librustc: Emit tuple struct constructor at callsite instead of via a call to a function.

Browse source
This commit is contained in:
Luqman Aden 2014-07-10 00:20:28 -07:00
parent cb404dd4fb
commit 06bf73a646
2 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/librustc/middle/trans/base.rs
View file

@ -1704,11 +1704,11 @@ pub fn trans_enum_variant(ccx: &CrateContext,
llfndecl); llfndecl);
} }
pub fn trans_enum_variant_constructor<'a>(mut bcx: &'a Block<'a>, pub fn trans_named_tuple_constructor<'a>(mut bcx: &'a Block<'a>,
ctor_ty: ty::t, ctor_ty: ty::t,
disr: ty::Disr, disr: ty::Disr,
args: callee::CallArgs, args: callee::CallArgs,
dest: expr::Dest) -> Result<'a> { dest: expr::Dest) -> Result<'a> {
let ccx = bcx.fcx.ccx; let ccx = bcx.fcx.ccx;
let tcx = &ccx.tcx; let tcx = &ccx.tcx;

36
src/librustc/middle/trans/callee.rs
View file

@ -54,6 +54,7 @@ use util::ppaux::Repr;
use std::gc::Gc; use std::gc::Gc;
use syntax::ast; use syntax::ast;
use syntax::ast_map;
use synabi = syntax::abi; use synabi = syntax::abi;
pub struct MethodData { pub struct MethodData {
@ -66,7 +67,7 @@ pub enum CalleeData {
// Constructor for enum variant/tuple-like-struct // Constructor for enum variant/tuple-like-struct
// i.e. Some, Ok // i.e. Some, Ok
TupleVariantConstructor(subst::Substs, ty::Disr), NamedTupleConstructor(subst::Substs, ty::Disr),
// Represents a (possibly monomorphized) top-level fn item or method // Represents a (possibly monomorphized) top-level fn item or method
// item. Note that this is just the fn-ptr and is not a Rust closure // item. Note that this is just the fn-ptr and is not a Rust closure
@ -138,6 +139,23 @@ fn trans<'a>(bcx: &'a Block<'a>, expr: &ast::Expr) -> Callee<'a> {
debug!("trans_def(def={}, ref_expr={})", def.repr(bcx.tcx()), ref_expr.repr(bcx.tcx())); debug!("trans_def(def={}, ref_expr={})", def.repr(bcx.tcx()), ref_expr.repr(bcx.tcx()));
let expr_ty = node_id_type(bcx, ref_expr.id); let expr_ty = node_id_type(bcx, ref_expr.id);
match def { match def {
def::DefFn(did, _) if {
let def_id = if did.krate != ast::LOCAL_CRATE {
inline::maybe_instantiate_inline(bcx.ccx(), did)
} else {
did
};
match bcx.tcx().map.find(def_id.node) {
Some(ast_map::NodeStructCtor(_)) => true,
_ => false
}
} => {
let substs = node_id_substs(bcx, ExprId(ref_expr.id));
Callee {
bcx: bcx,
data: NamedTupleConstructor(substs, 0)
}
}
def::DefFn(did, _) if match ty::get(expr_ty).sty { def::DefFn(did, _) if match ty::get(expr_ty).sty {
ty::ty_bare_fn(ref f) => f.abi == synabi::RustIntrinsic, ty::ty_bare_fn(ref f) => f.abi == synabi::RustIntrinsic,
_ => false _ => false
@ -170,11 +188,15 @@ fn trans<'a>(bcx: &'a Block<'a>, expr: &ast::Expr) -> Callee<'a> {
Callee { Callee {
bcx: bcx, bcx: bcx,
data: TupleVariantConstructor(substs, vinfo.disr_val) data: NamedTupleConstructor(substs, vinfo.disr_val)
} }
} }
def::DefStruct(def_id) => { def::DefStruct(_) => {
fn_callee(bcx, trans_fn_ref(bcx, def_id, ExprId(ref_expr.id))) let substs = node_id_substs(bcx, ExprId(ref_expr.id));
Callee {
bcx: bcx,
data: NamedTupleConstructor(substs, 0)
}
} }
def::DefStatic(..) | def::DefStatic(..) |
def::DefArg(..) | def::DefArg(..) |
@ -719,13 +741,13 @@ pub fn trans_call_inner<'a>(
arg_cleanup_scope, args, arg_cleanup_scope, args,
dest.unwrap(), substs); dest.unwrap(), substs);
} }
TupleVariantConstructor(substs, disr) => { NamedTupleConstructor(substs, disr) => {
assert!(dest.is_some()); assert!(dest.is_some());
fcx.pop_custom_cleanup_scope(arg_cleanup_scope); fcx.pop_custom_cleanup_scope(arg_cleanup_scope);
let ctor_ty = callee_ty.subst(bcx.tcx(), &substs); let ctor_ty = callee_ty.subst(bcx.tcx(), &substs);
return base::trans_enum_variant_constructor(bcx, ctor_ty, disr, return base::trans_named_tuple_constructor(bcx, ctor_ty, disr,
args, dest.unwrap()); args, dest.unwrap());
} }
}; };