Skip to content

Commit 48c7bc1

Browse files
committed
rustc: Remove task type defs from trans
1 parent d1d8559 commit 48c7bc1

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

Diff for: src/librustc/middle/trans/base.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3064,9 +3064,6 @@ pub fn trans_crate(sess: session::Session,
30643064
}
30653065
let int_type = T_int(targ_cfg);
30663066
let float_type = T_float(targ_cfg);
3067-
let task_type = T_task(targ_cfg);
3068-
let taskptr_type = T_ptr(task_type);
3069-
lib::llvm::associate_type(tn, @"taskptr", taskptr_type);
30703067
let tydesc_type = T_tydesc(targ_cfg);
30713068
lib::llvm::associate_type(tn, @"tydesc", tydesc_type);
30723069
let crate_map = decl_crate_map(sess, link_meta, llmod);
@@ -3131,7 +3128,6 @@ pub fn trans_crate(sess: session::Session,
31313128
tydesc_type: tydesc_type,
31323129
int_type: int_type,
31333130
float_type: float_type,
3134-
task_type: task_type,
31353131
opaque_vec_type: T_opaque_vec(targ_cfg),
31363132
builder: BuilderRef_res(unsafe { llvm::LLVMCreateBuilder() }),
31373133
shape_cx: mk_ctxt(llmod),

Diff for: src/librustc/middle/trans/common.rs

-25
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ pub struct CrateContext {
221221
tydesc_type: TypeRef,
222222
int_type: TypeRef,
223223
float_type: TypeRef,
224-
task_type: TypeRef,
225224
opaque_vec_type: TypeRef,
226225
builder: BuilderRef_res,
227226
shape_cx: shape::Ctxt,
@@ -934,28 +933,6 @@ pub fn T_empty_struct() -> TypeRef { return T_struct([], false); }
934933
// they are described by this opaque type.
935934
pub fn T_vtable() -> TypeRef { T_array(T_ptr(T_i8()), 1u) }
936935

937-
pub fn T_task(targ_cfg: @session::config) -> TypeRef {
938-
let t = T_named_struct("task");
939-
940-
// Refcount
941-
// Delegate pointer
942-
// Stack segment pointer
943-
// Runtime SP
944-
// Rust SP
945-
// GC chain
946-
947-
948-
// Domain pointer
949-
// Crate cache pointer
950-
951-
let t_int = T_int(targ_cfg);
952-
let elems =
953-
~[t_int, t_int, t_int, t_int,
954-
t_int, t_int, t_int, t_int];
955-
set_struct_body(t, elems, false);
956-
return t;
957-
}
958-
959936
pub fn T_tydesc_field(cx: @CrateContext, field: uint) -> TypeRef {
960937
// Bit of a kludge: pick the fn typeref out of the tydesc..
961938

@@ -1085,8 +1062,6 @@ pub fn T_chan(cx: @CrateContext, _t: TypeRef) -> TypeRef {
10851062

10861063
}
10871064

1088-
pub fn T_taskptr(cx: @CrateContext) -> TypeRef { return T_ptr(cx.task_type); }
1089-
10901065

10911066
pub fn T_opaque_cbox_ptr(cx: @CrateContext) -> TypeRef {
10921067
// closures look like boxes (even when they are ~fn or &fn)

0 commit comments

Comments
 (0)