diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-01 02:10:19 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-08-01 02:10:19 +0000 |
| commit | fb29a4dcda2b9c4fde85c6cf237d5158c0fe583e (patch) | |
| tree | c548a2cd2aeb418af18c98a7856ed7b70ac19ed6 | |
| parent | 66cc7e043be0b7fc8aec18d755afdd0f85302578 (diff) | |
| download | ruby-fb29a4dcda2b9c4fde85c6cf237d5158c0fe583e.tar.gz | |
should not copy promoted flags.
* include/ruby/ruby.h (rb_clone_setup): should not copy some flags
(FL_PROMOTED0|FL_PROMOTED1|FL_FINALIZE).
[Bug #13775]
* test/ruby/test_object.rb: add a test (note that this test will fail
only when RGENGC_CHECK_MODE >= 2).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | include/ruby/ruby.h | 3 | ||||
| -rw-r--r-- | test/ruby/test_object.rb | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 460dc96230..51dadc9819 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -2028,7 +2028,8 @@ rb_special_const_p(VALUE obj) static inline void rb_clone_setup(VALUE clone, VALUE obj) { - rb_obj_setup(clone, rb_singleton_class_clone(obj), RBASIC(obj)->flags); + rb_obj_setup(clone, rb_singleton_class_clone(obj), + RBASIC(obj)->flags & ~(FL_PROMOTED0|FL_PROMOTED1|FL_FINALIZE)); rb_singleton_class_attached(RBASIC_CLASS(clone), clone); if (RB_FL_TEST(obj, RUBY_FL_EXIVAR)) rb_copy_generic_ivar(clone, obj); } diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 1e952533a6..e7d623283f 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -934,4 +934,14 @@ class TestObject < Test::Unit::TestCase num.times {a.clone.set} end; end + + def test_clone_object_should_not_be_old + assert_normal_exit <<-EOS, '[Bug #13775]' + b = proc { } + 10.times do |i| + b.clone + GC.start + end + EOS + end end |