* gc.c: rename is_dying_object() to is_garbage_object().

* gc.h: rb_objspace_garbage_object_p() as an exported function.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 82306bbf4b..ad4b15b734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul  7 00:36:13 2014  Koichi Sasada  <[email protected]>
+
+	* gc.c: rename is_dying_object() to is_garbage_object().
+
+	* gc.h: rb_objspace_garbage_object_p() as an exported function.
+
 Sun Jul  6 21:30:35 2014  Koichi Sasada  <[email protected]>
 
 	* gc.c (is_dying_object): fix missed condition.
diff --git a/gc.c b/gc.c
index 2d0ba1d61d..fd84749dd5 100644
--- a/gc.c
+++ b/gc.c
@@ -2329,8 +2329,9 @@ is_swept_object(rb_objspace_t *objspace, VALUE ptr)
     }
 }
 
+/* garbage objects will be collected soon. */
 static inline int
-is_dying_object(rb_objspace_t *objspace, VALUE ptr)
+is_garbage_object(rb_objspace_t *objspace, VALUE ptr)
 {
     if (!is_lazy_sweeping(heap_eden) ||
 	is_swept_object(objspace, ptr) ||
@@ -2352,7 +2353,7 @@ is_live_object(rb_objspace_t *objspace, VALUE ptr)
 	return FALSE;
     }
 
-    if (!is_dying_object(objspace, ptr)) {
+    if (!is_garbage_object(objspace, ptr)) {
 	return TRUE;
     }
     else {
@@ -2382,10 +2383,10 @@ rb_objspace_markable_object_p(VALUE obj)
 }
 
 int
-rb_objspace_dying_object_p(VALUE obj)
+rb_objspace_garbage_object_p(VALUE obj)
 {
     rb_objspace_t *objspace = &rb_objspace;
-    return is_dying_object(objspace, obj);
+    return is_garbage_object(objspace, obj);
 }
 
 /*
diff --git a/gc.h b/gc.h
index d3bf71026c..2ba46c9250 100644
--- a/gc.h
+++ b/gc.h
@@ -92,6 +92,7 @@ void rb_objspace_reachable_objects_from_root(void (func)(const char *category, V
 int rb_objspace_markable_object_p(VALUE obj);
 int rb_objspace_internal_object_p(VALUE obj);
 int rb_objspace_marked_object_p(VALUE obj);
+int rb_objspace_garbage_object_p(VALUE obj);
 
 void rb_objspace_each_objects(
     int (*callback)(void *start, void *end, size_t stride, void *data),