* gc.c (rb_imemo_new): should not pass FL_WB_PROTECTED flag.

* gc.c (rb_wb_protected_newobj_of): add more assertions.

* gc.c (rb_wb_unprotected_newobj_of): ditto.




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

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index abe56cc8be..5229c6cc8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 29 16:42:19 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_imemo_new): should not pass FL_WB_PROTECTED flag.
+
+	* gc.c (rb_wb_protected_newobj_of): add more assertions.
+
+	* gc.c (rb_wb_unprotected_newobj_of): ditto.
+
 Thu Oct 29 16:20:26 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c: introduce rb_wb_unprotected_newobj_of() and
diff --git a/gc.c b/gc.c
index dc41ce8137..a852d5fea8 100644
--- a/gc.c
+++ b/gc.c
@@ -1850,12 +1850,14 @@ rb_newobj(void)
 VALUE
 rb_wb_unprotected_newobj_of(VALUE klass, VALUE flags)
 {
+    if (RGENGC_CHECK_MODE > 0) assert((flags & FL_WB_PROTECTED) == 0);
     return newobj_of(klass, flags, 0, 0, 0, FALSE);
 }
 
 VALUE
 rb_wb_protected_newobj_of(VALUE klass, VALUE flags)
 {
+    if (RGENGC_CHECK_MODE > 0) assert((flags & FL_WB_PROTECTED) == 0);
     return newobj_of(klass, flags, 0, 0, 0, TRUE);
 }
 
@@ -1878,7 +1880,7 @@ rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
 VALUE
 rb_imemo_new(enum imemo_type type, VALUE v1, VALUE v2, VALUE v3, VALUE v0)
 {
-    VALUE flags = T_IMEMO | (type << FL_USHIFT) | FL_WB_PROTECTED;
+    VALUE flags = T_IMEMO | (type << FL_USHIFT);
     return newobj_of(v0, flags, v1, v2, v3, TRUE);
 }