From 48c7bc17c68032d142dd6ce53b8f5933d52c2165 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Tue, 11 Jun 2013 12:36:42 -0700 Subject: [PATCH] rustc: Remove task type defs from trans --- src/librustc/middle/trans/base.rs | 4 ---- src/librustc/middle/trans/common.rs | 25 ------------------------- 2 files changed, 29 deletions(-) diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 8e015d9a677..210daed51b0 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -3064,9 +3064,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); @@ -3131,7 +3128,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::LLVMCreateBuilder() }), shape_cx: mk_ctxt(llmod), diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs index b29972f039b..e0ba743f913 100644 --- a/src/librustc/middle/trans/common.rs +++ b/src/librustc/middle/trans/common.rs @@ -221,7 +221,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, @@ -934,28 +933,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.. @@ -1085,8 +1062,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)