summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorodaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-22 13:41:08 +0000
committerodaira <odaira@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-22 13:41:08 +0000
commit88376e639eb9344205876a2c80c759b68e1cf6ea (patch)
treeeaf2fc367546769efc71039b2b5a97e6feb8edcd
parentd71ead259e0b28aa8e6dc472c3fa33adbe0b23eb (diff)
* gc.c (rb_raw_obj_info): fix compile errors when USE_RGENGC
is 0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--gc.c13
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 103eb80..8541113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 22 22:23:37 2015 Rei Odaira <Rei.Odaira@gmail.com>
+
+ * gc.c (rb_raw_obj_info): fix compile errors when USE_RGENGC
+ is 0.
+
Sun Nov 22 21:58:09 2015 Naohisa Goto <ngotogenome@gmail.com>
* lib/cmath.rb: methods which has suffix '!' are now deprecated.
diff --git a/gc.c b/gc.c
index 182ad42..d16e2ae 100644
--- a/gc.c
+++ b/gc.c
@@ -8965,11 +8965,12 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
snprintf(buff, buff_size, "%s", obj_type_name(obj));
}
else {
- const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
- const int type = BUILTIN_TYPE(obj);
-
#define TF(c) ((c) != 0 ? "true" : "false")
#define C(c, s) ((c) != 0 ? (s) : " ")
+ const int type = BUILTIN_TYPE(obj);
+#if USE_RGENGC
+ const int age = RVALUE_FLAGS_AGE(RBASIC(obj)->flags);
+
snprintf(buff, buff_size, "%p [%d%s%s%s%s] %s",
(void *)obj, age,
C(RVALUE_UNCOLLECTIBLE_BITMAP(obj), "L"),
@@ -8977,6 +8978,12 @@ rb_raw_obj_info(char *buff, const int buff_size, VALUE obj)
C(RVALUE_MARKING_BITMAP(obj), "R"),
C(RVALUE_WB_UNPROTECTED_BITMAP(obj), "U"),
obj_type_name(obj));
+#else
+ snprintf(buff, buff_size, "%p [%s] %s",
+ (void *)obj,
+ C(RVALUE_MARK_BITMAP(obj), "M"),
+ obj_type_name(obj));
+#endif
if (internal_object_p(obj)) {
/* ignore */