summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-30 10:30:47 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-30 10:30:47 +0000
commita96ae767acf13442e29b8f1f632403a2ee8fa286 (patch)
tree19e83d1652d1a633a3ae5900083a6c2a85028f9c
parent8ced6af83ffa9c9bce220adf2ccca899e41b9bc3 (diff)
* gc.c (newobj_slowpath): do not need to use flags hack (commit miss).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a636080ebe..afde26c6e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 30 19:29:52 2015 Koichi Sasada <ko1@atdot.net>
+
+ * gc.c (newobj_slowpath): do not need to use flags hack (commit miss).
+
Fri Oct 30 19:08:48 2015 Koichi Sasada <ko1@atdot.net>
* gc.c (heap_get_freeobj_from_next_freepage): not so UNLIKELY.
diff --git a/gc.c b/gc.c
index d6f84af214..e57d616f62 100644
--- a/gc.c
+++ b/gc.c
@@ -1807,7 +1807,7 @@ newobj_slowpath(VALUE klass, VALUE flags, VALUE v1, VALUE v2, VALUE v3, rb_objsp
}
obj = heap_get_freeobj(objspace, heap_eden);
- newobj_init(klass, (flags & ~FL_WB_PROTECTED), v1, v2, v3, (flags & FL_WB_PROTECTED) ? TRUE : FALSE, objspace, obj);
+ newobj_init(klass, flags, v1, v2, v3, wb_protected, objspace, obj);
gc_event_hook(objspace, RUBY_INTERNAL_EVENT_NEWOBJ, obj);
return obj;
}