Skip to content

Commit

Permalink
continue Nathan's work
Browse files Browse the repository at this point in the history
  • Loading branch information
@d-netto
d-netto committed May 19, 2023
1 parent 1458862 commit 9fdc2d1
Showing 1 changed file with 36 additions and 59 deletions.
95 changes: 36 additions & 59 deletions src/gc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1777,52 +1777,37 @@ STATIC_INLINE uintptr_t gc_read_stack(void *_addr, uintptr_t offset,
return *(uintptr_t*)real_addr;
}

NOINLINE void assert_validity_of_new_obj(jl_value_t* parent, jl_value_t* obj) {
jl_taggedvalue_t *o = jl_astaggedvalue(obj);
uintptr_t vtag = o->header & ~(uintptr_t)0xf;
jl_datatype_t *vt = (jl_datatype_t *)vtag;
//jl_datatype_t* vt = (jl_datatype_t*) jl_typeof(obj);
jl_datatype_t* parent_typ = (jl_datatype_t*) jl_typeof(parent);

if (vtag == (jl_datatype_tag << 4) ||
vtag == (jl_unionall_tag << 4) ||
vtag == (jl_uniontype_tag << 4) ||
vtag == (jl_tvar_tag << 4) ||
vtag == (jl_vararg_tag << 4)) {
STATIC_INLINE void gc_assert_parent_validity(jl_value_t *parent, jl_value_t *child) JL_NOTSAFEPOINT
{
#ifdef GC_ASSERT_PARENT_VALIDITY
jl_taggedvalue_t *child_astagged = jl_astaggedvalue(child);
jl_taggedvalue_t *child_vtag = (jl_taggedvalue_t *)(child_astagged->header & ~(uintptr_t)0xf);
uintptr_t child_vt = (uintptr_t)child_vtag;
if (child_vt == (jl_datatype_tag << 4) ||
child_vt == (jl_unionall_tag << 4) ||
child_vt == (jl_uniontype_tag << 4) ||
child_vt == (jl_tvar_tag << 4) ||
child_vt == (jl_vararg_tag << 4)) {
// Skip, since these wouldn't hit the object assert anyway
return;
}
else if (vtag < jl_max_tags << 4) {
else if (child_vt < jl_max_tags << 4) {
// Skip, since these wouldn't hit the object assert anyway
return;
}
if (__unlikely(!jl_is_datatype(vt) || vt->smalltag)) {
// if (__unlikely(!jl_is_datatype(vt))) {
jl_safe_printf("GC error (probable corruption) while enqueing:\n");
if (__unlikely(!jl_is_datatype((jl_datatype_t *)child_vt) || ((jl_datatype_t *)child_vt)->smalltag)) {
jl_safe_printf("GC error (probable corruption)\n");
jl_gc_debug_print_status();
jl_safe_printf("Parent %p,", (void*)parent);
jl_safe_printf(" of type:\n");
jl_(parent_typ);

jl_safe_printf("While marking object at %p,", (void*)obj);
jl_safe_printf(" of type:\n");
jl_(vt);
jl_safe_printf("Parent %p\n", (void *)parent);
jl_safe_printf("of type:\n");
jl_(jl_typeof(parent));
jl_safe_printf("While marking child at %p\n", (void *)child);
jl_safe_printf("of type:\n");
jl_(child_vtag);
jl_gc_debug_critical_error();
abort();
}
}

JL_NORETURN NOINLINE void gc_assert_datatype_fail(jl_ptls_t ptls, jl_value_t* obj,
jl_datatype_t *vt,
jl_gc_markqueue_t *mq) JL_NOTSAFEPOINT
{
jl_safe_printf("GC error (probable corruption) :\n");
jl_gc_debug_print_status();
jl_safe_printf("While marking object at %p,", (void*)obj);
jl_safe_printf(" of type:\n");
jl_(vt);
jl_gc_debug_critical_error();
abort();
#endif
}

// Check if `nptr` is tagged for `old + refyoung`,
Expand Down Expand Up @@ -1922,8 +1907,8 @@ STATIC_INLINE jl_value_t *gc_mark_obj8(jl_ptls_t ptls, char *obj8_parent, uint8_
if (new_obj != NULL) {
verify_parent2("object", obj8_parent, slot, "field(%d)",
gc_slot_to_fieldidx(obj8_parent, slot, (jl_datatype_t*)jl_typeof(obj8_parent)));
gc_assert_parent_validity((jl_value_t *)obj8_parent, new_obj);
if (obj8_begin + 1 != obj8_end) {
assert_validity_of_new_obj((jl_value_t*)obj8_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
}
else {
Expand Down Expand Up @@ -1954,8 +1939,8 @@ STATIC_INLINE jl_value_t *gc_mark_obj16(jl_ptls_t ptls, char *obj16_parent, uint
if (new_obj != NULL) {
verify_parent2("object", obj16_parent, slot, "field(%d)",
gc_slot_to_fieldidx(obj16_parent, slot, (jl_datatype_t*)jl_typeof(obj16_parent)));
gc_assert_parent_validity((jl_value_t *)obj16_parent, new_obj);
if (obj16_begin + 1 != obj16_end) {
assert_validity_of_new_obj((jl_value_t*)obj16_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
}
else {
Expand Down Expand Up @@ -1986,8 +1971,8 @@ STATIC_INLINE jl_value_t *gc_mark_obj32(jl_ptls_t ptls, char *obj32_parent, uint
if (new_obj != NULL) {
verify_parent2("object", obj32_parent, slot, "field(%d)",
gc_slot_to_fieldidx(obj32_parent, slot, (jl_datatype_t*)jl_typeof(obj32_parent)));
gc_assert_parent_validity((jl_value_t *)obj32_parent, new_obj);
if (obj32_begin + 1 != obj32_end) {
assert_validity_of_new_obj((jl_value_t*)obj32_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
}
else {
Expand Down Expand Up @@ -2052,7 +2037,7 @@ STATIC_INLINE void gc_mark_objarray(jl_ptls_t ptls, jl_value_t *obj_parent, jl_v
if (new_obj != NULL) {
verify_parent2("obj array", obj_parent, obj_begin, "elem(%d)",
gc_slot_to_arrayidx(obj_parent, obj_begin));
assert_validity_of_new_obj((jl_value_t*)obj_parent, new_obj);
gc_assert_parent_validity(obj_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
gc_heap_snapshot_record_array_edge(obj_parent, &new_obj);
}
Expand Down Expand Up @@ -2126,6 +2111,7 @@ STATIC_INLINE void gc_mark_array8(jl_ptls_t ptls, jl_value_t *ary8_parent, jl_va
if (new_obj != NULL) {
verify_parent2("array", ary8_parent, &new_obj, "elem(%d)",
gc_slot_to_arrayidx(ary8_parent, ary8_begin));
gc_assert_parent_validity(ary8_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
gc_heap_snapshot_record_array_edge(ary8_parent, &new_obj);
}
Expand Down Expand Up @@ -2200,6 +2186,7 @@ STATIC_INLINE void gc_mark_array16(jl_ptls_t ptls, jl_value_t *ary16_parent, jl_
if (new_obj != NULL) {
verify_parent2("array", ary16_parent, &new_obj, "elem(%d)",
gc_slot_to_arrayidx(ary16_parent, ary16_begin));
gc_assert_parent_validity(ary16_parent, new_obj);
gc_try_claim_and_push(mq, new_obj, &nptr);
gc_heap_snapshot_record_array_edge(ary16_parent, &new_obj);
}
Expand Down Expand Up @@ -2353,12 +2340,16 @@ STATIC_INLINE void gc_mark_module_binding(jl_ptls_t ptls, jl_module_t *mb_parent
if (b == (jl_binding_t *)jl_nothing)
continue;
verify_parent1("module", mb_parent, mb_begin, "binding_buff");
gc_assert_parent_validity((jl_value_t *)mb_parent, (jl_value_t *)b);
gc_try_claim_and_push(mq, b, &nptr);
}
jl_value_t *bindings = (jl_value_t *)jl_atomic_load_relaxed(&mb_parent->bindings);
gc_assert_parent_validity((jl_value_t *)mb_parent, bindings);
gc_try_claim_and_push(mq, bindings, &nptr);
jl_value_t *bindingkeyset = (jl_value_t *)jl_atomic_load_relaxed(&mb_parent->bindingkeyset);
gc_assert_parent_validity((jl_value_t *)mb_parent, bindingkeyset);
gc_try_claim_and_push(mq, bindingkeyset, &nptr);
gc_assert_parent_validity((jl_value_t *)mb_parent, (jl_value_t *)mb_parent->parent);
gc_try_claim_and_push(mq, (jl_value_t *)mb_parent->parent, &nptr);
size_t nusings = mb_parent->usings.len;
if (nusings > 0) {
Expand Down Expand Up @@ -2388,7 +2379,7 @@ void gc_mark_finlist_(jl_gc_markqueue_t *mq, jl_value_t **fl_begin, jl_value_t *
}
for (; fl_begin < fl_end; fl_begin++) {
new_obj = *fl_begin;
if (__unlikely(!new_obj))
if (__unlikely(new_obj == NULL))
continue;
if (gc_ptr_tag(new_obj, 1)) {
new_obj = (jl_value_t *)gc_ptr_clear_tag(new_obj, 1);
Expand Down Expand Up @@ -2434,7 +2425,6 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
int meta_updated)
{
jl_value_t *new_obj = (jl_value_t *)_new_obj;
jl_value_t *parent = new_obj; // For debugging
mark_obj: {
#ifdef JL_DEBUG_BUILD
if (new_obj == gc_findval)
Expand Down Expand Up @@ -2557,10 +2547,8 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
if (new_obj != NULL) {
if (!meta_updated)
goto mark_obj;
else {
assert_validity_of_new_obj(parent, new_obj);
else
gc_ptr_queue_push(mq, new_obj);
}
}
}
else if (vtag == jl_string_tag << 4) {
Expand All @@ -2580,11 +2568,6 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
}
return;
}
else {
jl_datatype_t *vt = (jl_datatype_t *)vtag;
if (__unlikely(!jl_is_datatype(vt) || vt->smalltag))
gc_assert_datatype_fail(ptls, new_obj, vt, mq);
}
jl_datatype_t *vt = (jl_datatype_t *)vtag;
if (vt->name == jl_array_typename) {
jl_array_t *a = (jl_array_t *)new_obj;
Expand Down Expand Up @@ -2700,10 +2683,8 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
if (new_obj != NULL) {
if (!meta_updated)
goto mark_obj;
else {
assert_validity_of_new_obj(parent, new_obj);
else
gc_ptr_queue_push(mq, new_obj);
}
}
}
else if (layout->fielddesc_type == 1) {
Expand All @@ -2715,10 +2696,8 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
if (new_obj != NULL) {
if (!meta_updated)
goto mark_obj;
else {
assert_validity_of_new_obj(parent, new_obj);
else
gc_ptr_queue_push(mq, new_obj);
}
}
}
else if (layout->fielddesc_type == 2) {
Expand All @@ -2732,10 +2711,8 @@ FORCE_INLINE void gc_mark_outrefs(jl_ptls_t ptls, jl_gc_markqueue_t *mq, void *_
if (new_obj != NULL) {
if (!meta_updated)
goto mark_obj;
else {
assert_validity_of_new_obj(parent, new_obj);
else
gc_ptr_queue_push(mq, new_obj);
}
}
}
else {
Expand Down

0 comments on commit 9fdc2d1

Please sign in to comment.