summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--gc.c14
2 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6db397cb24..9c623b89fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 10 15:56:48 2013 Aman Gupta <ruby@tmm1.net>
+
+ * gc.c (reflist_add): revert changes from r44109. it is unnecessary
+ after r44113
+ * gc.c (allrefs_i): fix whitespace
+ * gc.c (allrefs_roots_i): fix whitespace
+
Tue Dec 10 15:46:03 2013 Koichi Sasada <ko1@atdot.net>
* gc.c (allrefs_add): push obj only if allrefs table doesn't have
diff --git a/gc.c b/gc.c
index 53af182034..bef72b0ece 100644
--- a/gc.c
+++ b/gc.c
@@ -4165,21 +4165,15 @@ reflist_destruct(struct reflist *refs)
xfree(refs);
}
-static int
+static void
reflist_add(struct reflist *refs, VALUE obj)
{
- int i = 0;
if (refs->pos == refs->size) {
refs->size *= 2;
SIZED_REALLOC_N(refs->list, VALUE, refs->size, refs->size/2);
}
- for (i=0; i<refs->pos; i++)
- if (refs->list[i] == obj)
- return 0; /* already exists */
-
refs->list[refs->pos++] = obj;
- return 1; /* added */
}
static void
@@ -4248,7 +4242,7 @@ allrefs_i(VALUE obj, void *ptr)
if (allrefs_add(data, obj)) {
push_mark_stack(&data->objspace->mark_stack, obj);
-}
+ }
}
static void
@@ -4259,8 +4253,8 @@ allrefs_roots_i(VALUE obj, void *ptr)
data->root_obj = MAKE_ROOTSIG(data->category);
if (allrefs_add(data, obj)) {
- push_mark_stack(&data->objspace->mark_stack, obj);
-}
+ push_mark_stack(&data->objspace->mark_stack, obj);
+ }
}
static st_table *