Skip to content

Commit 2849103

Browse files
committed
rustc: Get rid of native Rust glue for all upcalls except the exit task glue
1 parent 55f0f79 commit 2849103

File tree

2 files changed

+114
-133
lines changed

2 files changed

+114
-133
lines changed

src/comp/back/upcall.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@ fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
8484
log_str=dv("log_str", vec(T_i32(), T_ptr(T_str()))),
8585
trace_word=dv("trace_word", vec(T_int())),
8686
trace_str=dv("trace_str", vec(T_ptr(T_i8()))),
87-
new_port=d("new_port", vec(T_size_t()), T_opaque_port_ptr(tn)),
88-
del_port=dv("del_port", vec(T_opaque_port_ptr(tn))),
89-
new_chan=dv("new_chan", vec(T_opaque_port_ptr(tn))),
90-
flush_chan=dv("flush_chan", vec(T_opaque_chan_ptr(tn))),
91-
del_chan=dv("del_chan", vec(T_opaque_chan_ptr(tn))),
92-
clone_chan=d("clone_chan", vec(T_taskptr(tn), T_opaque_chan_ptr(tn)),
93-
T_opaque_chan_ptr(tn)),
87+
new_port=d("new_port", vec(T_size_t()), T_opaque_port_ptr()),
88+
del_port=dv("del_port", vec(T_opaque_port_ptr())),
89+
new_chan=d("new_chan", vec(T_opaque_port_ptr()), T_opaque_chan_ptr()),
90+
flush_chan=dv("flush_chan", vec(T_opaque_chan_ptr())),
91+
del_chan=dv("del_chan", vec(T_opaque_chan_ptr())),
92+
clone_chan=d("clone_chan", vec(T_taskptr(tn), T_opaque_chan_ptr()),
93+
T_opaque_chan_ptr()),
9494
_yield=dv("yield", empty_vec),
9595
sleep=dv("sleep", vec(T_size_t())),
9696
_join=dv("join", vec(T_taskptr(tn))),
97-
send=dv("send", vec(T_opaque_chan_ptr(tn), T_ptr(T_i8()))),
98-
recv=dv("recv", vec(T_ptr(T_int()), T_opaque_port_ptr(tn))),
97+
send=dv("send", vec(T_opaque_chan_ptr(), T_ptr(T_i8()))),
98+
recv=dv("recv", vec(T_ptr(T_ptr(T_i8())), T_opaque_port_ptr())),
9999
_fail=dv("fail", vec(T_ptr(T_i8()), T_ptr(T_i8()), T_size_t())),
100100
kill=dv("kill", vec(T_taskptr(tn))),
101101
exit=dv("exit", empty_vec),

0 commit comments

Comments
 (0)