summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 01:45:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-19 01:45:45 +0000
commitd9a597408f0f192ff25ab51e1e6733fe6fefc01b (patch)
treef90cfc910b6aad5a179ea4ab9232c67e04787b40 /include
parentc7d0edb5b6765525397010f3360466b3cec2253c (diff)
class.c: do not freeze meta-meta-class
* class.c (rb_freeze_singleton_class): should not propagate to meta-meta-class, and so on, which is shared with the original class. fix occational exceptions. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r--include/ruby/ruby.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 4b57e78..f6dfd97 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1108,14 +1108,15 @@ struct RStruct {
#define OBJ_FREEZE_RAW(x) (RBASIC(x)->flags |= FL_FREEZE)
#define OBJ_FREEZE(x) rb_obj_freeze_inline((VALUE)x)
+void rb_freeze_singleton_class(VALUE klass);
+
static inline void
rb_obj_freeze_inline(VALUE x)
{
if (FL_ABLE(x)) {
- VALUE klass = RBASIC_CLASS(x);
OBJ_FREEZE_RAW(x);
- if (FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
- OBJ_FREEZE_RAW(klass);
+ if (!(RBASIC(x)->flags & FL_SINGLETON)) {
+ rb_freeze_singleton_class(x);
}
}
}