diff options
| author | Michael Sullivan <sully@msully.net> | 2012-07-09 14:56:11 -0700 |
|---|---|---|
| committer | Michael Sullivan <sully@msully.net> | 2012-07-10 16:33:21 -0700 |
| commit | 260f73ed85cdf1421ee1b1d241b3cca438a4ac44 (patch) | |
| tree | 90356b7f8e56425fb317ab0370b67d37150f66a0 /src/rt/rust_upcall.cpp | |
| parent | 35bfaf50b096457dfc7d9a3728108b6a9324aa10 (diff) | |
| download | rust-260f73ed85cdf1421ee1b1d241b3cca438a4ac44.tar.gz rust-260f73ed85cdf1421ee1b1d241b3cca438a4ac44.zip | |
Get rid of unused fields in tydescs. Closes #2351.
Diffstat (limited to 'src/rt/rust_upcall.cpp')
| -rw-r--r-- | src/rt/rust_upcall.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 1ce7c1217dc..63b190b0a25 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -444,13 +444,11 @@ upcall_rust_personality(int version, extern "C" void shape_cmp_type(int8_t *result, const type_desc *tydesc, - const type_desc **subtydescs, uint8_t *data_0, - uint8_t *data_1, uint8_t cmp_type); + uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type); struct s_cmp_type_args { int8_t *result; const type_desc *tydesc; - const type_desc **subtydescs; uint8_t *data_0; uint8_t *data_1; uint8_t cmp_type; @@ -458,16 +456,15 @@ struct s_cmp_type_args { extern "C" void upcall_s_cmp_type(s_cmp_type_args *args) { - shape_cmp_type(args->result, args->tydesc, args->subtydescs, + shape_cmp_type(args->result, args->tydesc, args->data_0, args->data_1, args->cmp_type); } extern "C" void upcall_cmp_type(int8_t *result, const type_desc *tydesc, - const type_desc **subtydescs, uint8_t *data_0, - uint8_t *data_1, uint8_t cmp_type) { + uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type) { rust_task *task = rust_get_current_task(); - s_cmp_type_args args = {result, tydesc, subtydescs, + s_cmp_type_args args = {result, tydesc, data_0, data_1, cmp_type}; UPCALL_SWITCH_STACK(task, &args, upcall_s_cmp_type); } |