From 6964df9a21633be9c77eba96e56f8a62db8901d1 Mon Sep 17 00:00:00 2001 From: ko1 Date: Wed, 18 Mar 2015 21:31:55 +0000 Subject: * object.c (rb_obj_clone): do not touch age (FL_PROMOTED[01]) because rb_obj_alloc() can return old object in debug. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ object.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e0ff95313e..f5732f6daa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 19 06:30:35 2015 Koichi Sasada + + * object.c (rb_obj_clone): do not touch age (FL_PROMOTED[01]) because + rb_obj_alloc() can return old object in debug. + Thu Mar 19 06:29:28 2015 Koichi Sasada * test/objspace/test_objspace.rb: flag name was changed diff --git a/object.c b/object.c index 5c8bf62049..79358adae8 100644 --- a/object.c +++ b/object.c @@ -328,7 +328,7 @@ rb_obj_clone(VALUE obj) rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj)); } clone = rb_obj_alloc(rb_obj_class(obj)); - RBASIC(clone)->flags &= (FL_TAINT); + RBASIC(clone)->flags &= (FL_TAINT|FL_PROMOTED0|FL_PROMOTED1); RBASIC(clone)->flags |= RBASIC(obj)->flags & ~(FL_PROMOTED0|FL_PROMOTED1|FL_FREEZE|FL_FINALIZE); singleton = rb_singleton_class_clone_and_attach(obj, clone); -- cgit v1.2.3