Skip to content

Commit 5c4b984

Browse files
committed
Revert "WIP trying to debug make test-all TESTS=test/ruby/test_gc_compact.rb TESTOPTS='-n /moving_arrays_up/'"
This reverts commit f1622fd.
1 parent 1c116a5 commit 5c4b984

2 files changed

Lines changed: 2 additions & 24 deletions

File tree

gc/default/default.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ static ruby_gc_params_t gc_params = {
214214
* enable to embed GC debugging information.
215215
*/
216216
#ifndef GC_DEBUG
217-
#define GC_DEBUG 1
217+
#define GC_DEBUG 0
218218
#endif
219219

220220
/* RGENGC_DEBUG:
@@ -1363,8 +1363,6 @@ static inline void
13631363
RVALUE_OLD_UNCOLLECTIBLE_SET(rb_objspace_t *objspace, VALUE obj)
13641364
{
13651365
RB_DEBUG_COUNTER_INC(obj_promote);
1366-
GC_ASSERT(!RB_TYPE_P(obj, T_NONE));
1367-
GC_ASSERT(!RB_TYPE_P(obj, T_MOVED));
13681366
RVALUE_PAGE_OLD_UNCOLLECTIBLE_SET(objspace, GET_HEAP_PAGE(obj), obj);
13691367
}
13701368

@@ -5933,9 +5931,6 @@ rgengc_rememberset_mark_plane(rb_objspace_t *objspace, uintptr_t p, bits_t bitse
59335931
if (bitset & 1) {
59345932
VALUE obj = (VALUE)p;
59355933
gc_report(2, objspace, "rgengc_rememberset_mark: mark %s\n", rb_obj_info(obj));
5936-
if (!RVALUE_UNCOLLECTIBLE(objspace, obj)) {
5937-
fprintf(stderr, "addr %p\n", (void *)obj);
5938-
}
59395934
GC_ASSERT(RVALUE_UNCOLLECTIBLE(objspace, obj));
59405935
GC_ASSERT(RVALUE_OLD_P(objspace, obj) || RVALUE_WB_UNPROTECTED(objspace, obj));
59415936

@@ -6082,17 +6077,6 @@ rb_gc_impl_writebarrier(void *objspace_ptr, VALUE a, VALUE b)
60826077
{
60836078
rb_objspace_t *objspace = objspace_ptr;
60846079

6085-
GC_ASSERT(!RB_TYPE_P(a, T_NONE));
6086-
GC_ASSERT(!RB_TYPE_P(b, T_NONE));
6087-
GC_ASSERT(!RB_TYPE_P(a, T_MOVED));
6088-
GC_ASSERT(!RB_TYPE_P(b, T_MOVED));
6089-
if (RB_TYPE_P(a, T_HASH)) {
6090-
fprintf(stderr, "adding hash to RS %p\n", (void *)a);
6091-
}
6092-
if (RB_TYPE_P(b, T_HASH)) {
6093-
fprintf(stderr, "adding hash to RS %p\n", (void *)b);
6094-
}
6095-
60966080
if (RGENGC_CHECK_MODE) {
60976081
if (SPECIAL_CONST_P(a)) rb_bug("rb_gc_writebarrier: a is special const: %"PRIxVALUE, a);
60986082
if (SPECIAL_CONST_P(b)) rb_bug("rb_gc_writebarrier: b is special const: %"PRIxVALUE, b);
@@ -6954,8 +6938,6 @@ gc_move(rb_objspace_t *objspace, VALUE src, VALUE dest, size_t src_slot_size, si
69546938
int uncollectible;
69556939
int age;
69566940

6957-
struct rvalue_overhead * info = GET_RVALUE_OVERHEAD(src);
6958-
fprintf(stderr, "Moving object: %p -> %p %s %s:%d\n", (void *)src, (void *)dest, rb_obj_info(src), info->file, info->line);
69596941
gc_report(4, objspace, "Moving object: %p -> %p\n", (void *)src, (void *)dest);
69606942

69616943
GC_ASSERT(BUILTIN_TYPE(src) != T_NONE);
@@ -7033,8 +7015,6 @@ gc_move(rb_objspace_t *objspace, VALUE src, VALUE dest, size_t src_slot_size, si
70337015
}
70347016

70357017
if (uncollectible) {
7036-
GC_ASSERT(!RB_TYPE_P(dest, T_NONE));
7037-
GC_ASSERT(!RB_TYPE_P(dest, T_MOVED));
70387018
MARK_IN_BITMAP(GET_HEAP_UNCOLLECTIBLE_BITS(dest), dest);
70397019
}
70407020
else {

vm_insnhelper.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6051,11 +6051,9 @@ vm_invokeblock_fastpath(struct rb_execution_context_struct *ec,
60516051
}
60526052

60536053
cd->cc = ret;
6054-
//vm_ccs_push((VALUE)callee_iseq, ISEQ_BODY(callee_iseq)->block_ccs, ci, ret);
60556054
RB_OBJ_WRITTEN(reg_cfp->iseq, Qundef, ret);
6055+
vm_ccs_push((VALUE)callee_iseq, ISEQ_BODY(callee_iseq)->block_ccs, ci, ret);
60566056
RUBY_ASSERT(ret->klass == (VALUE)callee_iseq);
6057-
fprintf(stderr, "ret %p iseq %p\n", (void *)ret, (void *)callee_iseq);
6058-
RB_GC_GUARD(ret);
60596057
}
60606058
else {
60616059
/*

0 commit comments

Comments
 (0)