Skip to content

Commit

Permalink
rustc: Remove task type defs from trans
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Jun 11, 2013
1 parent d1d8559 commit 48c7bc1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
4 changes: 0 additions & 4 deletions src/librustc/middle/trans/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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),
Expand Down
25 changes: 0 additions & 25 deletions src/librustc/middle/trans/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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..

Expand Down Expand Up @@ -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)
Expand Down

5 comments on commit 48c7bc1

@bors
Copy link
Contributor

@bors bors commented on 48c7bc1 Jun 12, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from graydon
at brson@48c7bc1

@bors
Copy link
Contributor

@bors bors commented on 48c7bc1 Jun 12, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/notasktrans = 48c7bc1 into auto

@bors
Copy link
Contributor

@bors bors commented on 48c7bc1 Jun 12, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/notasktrans = 48c7bc1 merged ok, testing candidate = 8761b1f

@bors
Copy link
Contributor

@bors bors commented on 48c7bc1 Jun 12, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 48c7bc1 Jun 12, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 8761b1f

Please sign in to comment.