OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #7067 : brson/rust/notasktrans, r=graydon

This commit is contained in:
bors 2013-06-11 19:37:39 -07:00
parent e06579bc09 48c7bc17c6
commit 8761b1fb16
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3074,9 +3074,6 @@ pub fn trans_crate(sess: session::Session,
}
let int_type = T_int(targ_cfg);
let float_type = T_float(targ_cfg);
let task_type = T_task(targ_cfg);
let taskptr_type = T_ptr(task_type);
lib::llvm::associate_type(tn, @"taskptr", taskptr_type);
let tydesc_type = T_tydesc(targ_cfg);
lib::llvm::associate_type(tn, @"tydesc", tydesc_type);
let crate_map = decl_crate_map(sess, link_meta, llmod);
@ -3142,7 +3139,6 @@ pub fn trans_crate(sess: session::Session,
tydesc_type: tydesc_type,
int_type: int_type,
float_type: float_type,
task_type: task_type,
opaque_vec_type: T_opaque_vec(targ_cfg),
builder: BuilderRef_res(unsafe {
llvm::LLVMCreateBuilderInContext(llcx)

25
src/librustc/middle/trans/common.rs
View File

@ -223,7 +223,6 @@ pub struct CrateContext {
tydesc_type: TypeRef,
int_type: TypeRef,
float_type: TypeRef,
task_type: TypeRef,
opaque_vec_type: TypeRef,
builder: BuilderRef_res,
shape_cx: shape::Ctxt,
@ -952,28 +951,6 @@ pub fn T_empty_struct() -> TypeRef { return T_struct([], false); }
// they are described by this opaque type.
pub fn T_vtable() -> TypeRef { T_array(T_ptr(T_i8()), 1u) }
pub fn T_task(targ_cfg: @session::config) -> TypeRef {
let t = T_named_struct("task");
// Refcount
// Delegate pointer
// Stack segment pointer
// Runtime SP
// Rust SP
// GC chain
// Domain pointer
// Crate cache pointer
let t_int = T_int(targ_cfg);
let elems =
~[t_int, t_int, t_int, t_int,
t_int, t_int, t_int, t_int];
set_struct_body(t, elems, false);
return t;
}
pub fn T_tydesc_field(cx: @CrateContext, field: uint) -> TypeRef {
// Bit of a kludge: pick the fn typeref out of the tydesc..
@ -1103,8 +1080,6 @@ pub fn T_chan(cx: @CrateContext, _t: TypeRef) -> TypeRef {
}
pub fn T_taskptr(cx: @CrateContext) -> TypeRef { return T_ptr(cx.task_type); }
pub fn T_opaque_cbox_ptr(cx: @CrateContext) -> TypeRef {
// closures look like boxes (even when they are ~fn or &fn)