diff --git a/src/comp/back/abi.rs b/src/comp/back/abi.rs index 3d0a1ba8c09..2724368bb63 100644 --- a/src/comp/back/abi.rs +++ b/src/comp/back/abi.rs @@ -41,7 +41,7 @@ const tydesc_field_free_glue: int = 5; const tydesc_field_unused: int = 6; const tydesc_field_sever_glue: int = 7; const tydesc_field_mark_glue: int = 8; -const tydesc_field_is_stateful: int = 9; +const tydesc_field_unused2: int = 9; const tydesc_field_cmp_glue: int = 10; const tydesc_field_shape: int = 11; const tydesc_field_shape_tables: int = 12; diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs index 0c90de1ac38..d4083615f48 100644 --- a/src/comp/middle/trans.rs +++ b/src/comp/middle/trans.rs @@ -1275,7 +1275,7 @@ fn emit_tydescs(ccx: @crate_ctxt) { C_null(T_ptr(T_i8())), // unused C_null(glue_fn_ty), // sever_glue C_null(glue_fn_ty), // mark_glue - C_null(glue_fn_ty), // is_stateful + C_null(glue_fn_ty), // unused cmp_glue, // cmp_glue C_shape(ccx, shape), // shape shape_tables, // shape_tables diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp index c2fdce1081c..3d89aa918ce 100644 --- a/src/rt/rust_builtin.cpp +++ b/src/rt/rust_builtin.cpp @@ -201,8 +201,8 @@ static void debug_tydesc_helper(rust_task *task, type_desc *t) { LOG(task, stdlib, " size %" PRIdPTR ", align %" PRIdPTR - ", stateful %" PRIdPTR ", first_param 0x%" PRIxPTR, - t->size, t->align, t->is_stateful, t->first_param); + ", first_param 0x%" PRIxPTR, + t->size, t->align, t->first_param); } extern "C" CDECL void diff --git a/src/rt/rust_crate_cache.cpp b/src/rt/rust_crate_cache.cpp index ac7b56ad8b4..47b402102f3 100644 --- a/src/rt/rust_crate_cache.cpp +++ b/src/rt/rust_crate_cache.cpp @@ -38,8 +38,6 @@ rust_crate_cache::get_type_desc(size_t size, "rust_crate_cache::descs[%" PRIdPTR "] = 0x%" PRIxPTR, i, descs[i]); td->descs[i] = descs[i]; - // FIXME (issue #136): Below is a miscalculation. - td->is_stateful |= descs[i]->is_stateful; } td->n_obj_params = n_obj_params; td->n_params = n_descs - 1; diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index c01fc5f3127..b53e0bfd2a9 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -274,7 +274,7 @@ struct type_desc { void *unused; glue_fn *sever_glue; // For GC. glue_fn *mark_glue; // For GC. - uintptr_t is_stateful; + uintptr_t unused2; cmp_glue_fn *cmp_glue; const uint8_t *shape; const rust_shape_tables *shape_tables;