@@ -224,21 +224,23 @@ void upcall_s_create_shared_type_desc(s_create_shared_type_desc_args *args)
224
224
225
225
// Copy the main part of the type descriptor:
226
226
const type_desc *td = args->td ;
227
- int n_descs = td->n_descs ;
228
- size_t sz = sizeof (type_desc) + sizeof (type_desc*) * n_descs ;
227
+ int n_params = td->n_params ;
228
+ size_t sz = sizeof (type_desc) + sizeof (type_desc*) * n_params ;
229
229
args->res = (type_desc*) task->kernel ->malloc (sz, " create_shared_type_desc" );
230
230
memcpy (args->res , td, sizeof (type_desc));
231
231
232
232
// Recursively copy any referenced descriptors:
233
- if (n_descs == 0 ) {
233
+ if (n_params == 0 ) {
234
234
args->res ->first_param = NULL ;
235
235
} else {
236
236
args->res ->first_param = &args->res ->descs [1 ];
237
237
args->res ->descs [0 ] = args->res ;
238
- for (int i = 1 ; i < n_descs; i++) {
239
- s_create_shared_type_desc_args rec_args = { td->descs [i], 0 };
238
+ for (int i = 0 ; i < n_params; i++) {
239
+ s_create_shared_type_desc_args rec_args = {
240
+ td->first_param [i], 0
241
+ };
240
242
upcall_s_create_shared_type_desc (&rec_args);
241
- args->res ->descs [i] = rec_args.res ;
243
+ args->res ->first_param [i] = rec_args.res ;
242
244
}
243
245
}
244
246
}
@@ -260,8 +262,8 @@ void upcall_s_free_shared_type_desc(type_desc *td)
260
262
LOG_UPCALL_ENTRY (task);
261
263
262
264
// Recursively free any referenced descriptors:
263
- for (unsigned i = 1 ; i < td->n_descs ; i++) {
264
- upcall_s_free_shared_type_desc ((type_desc*) td->descs [i]);
265
+ for (unsigned i = 0 ; i < td->n_params ; i++) {
266
+ upcall_s_free_shared_type_desc ((type_desc*) td->first_param [i]);
265
267
}
266
268
267
269
task->kernel ->free (td);
0 commit comments