1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Freeze singleton class, not its origin

Browse Source 
Previously, when we froze an object, we froze
`RCLASS_ORIGIN(object.singleton_class)`, which didn't freeze
`object.singleton_class` when it has some prepended modules.

Origin iclass are internal objects and users can't interact with
them through Kernel#freeze?, Kernel#freeze, or any mutation method
that checks the frozen status. So we shouldn't touch the origin
iclasses when the frozen status should be visible.

[Bug #19169]
This commit is contained in:
Alan Wu 2022-12-06 12:06:25 -05:00
parent 47a5b34aba
commit bb8afd7265
Notes: git 2022-12-08 20:58:46 +00:00 
Merged: https://github.com/ruby/ruby/pull/6869
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
class.c
View File

@ -2148,7 +2148,7 @@ rb_freeze_singleton_class(VALUE x)
/* should not propagate to meta-meta-class, and so on */ /* should not propagate to meta-meta-class, and so on */
if (!(RBASIC(x)->flags & FL_SINGLETON)) { if (!(RBASIC(x)->flags & FL_SINGLETON)) {
VALUE klass = RBASIC_CLASS(x); VALUE klass = RBASIC_CLASS(x);
if (klass && (klass = RCLASS_ORIGIN(klass)) != 0 && if (klass && // no class when hidden from ObjectSpace
FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) { FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
OBJ_FREEZE_RAW(klass); OBJ_FREEZE_RAW(klass);
} }

13
test/ruby/test_object.rb
View File

@ -925,6 +925,19 @@ class TestObject < Test::Unit::TestCase
end end
end end
def test_singleton_class_freeze
x = Object.new
xs = x.singleton_class
x.freeze
assert_predicate(xs, :frozen?)
y = Object.new
ys = y.singleton_class
ys.prepend(Module.new)
y.freeze
assert_predicate(ys, :frozen?, '[Bug #19169]')
end
def test_redef_method_missing def test_redef_method_missing
bug5473 = '[ruby-core:40287]' bug5473 = '[ruby-core:40287]'
['ArgumentError.new("bug5473")', 'ArgumentError, "bug5473"', '"bug5473"'].each do |code| ['ArgumentError.new("bug5473")', 'ArgumentError, "bug5473"', '"bug5473"'].each do |code|