diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-13 18:33:28 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-13 18:33:28 +0000 |
commit | cd1e32f7ff27f86927acad462ac94ef92216acd9 (patch) | |
tree | b71e5c5d1ee0f20602cf1a284441d95faf3cb722 /insns.def | |
parent | 84b8954d0d2badac8d05ccdef8939dc210031273 (diff) |
merge revision(s) 54970: [Backport #12367]
* insns.def (defineclass): Also raise an error when redeclaring the
superclass of a class as Object and it has another superclass.
[Bug #12367] [ruby-core:75446]
* test/ruby/test_class.rb: test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'insns.def')
-rw-r--r-- | insns.def | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -863,10 +863,6 @@ defineclass rb_obj_class(super)); } - if (super == Qnil) { - super = rb_cObject; - } - vm_check_if_namespace(cbase); /* find klass */ @@ -879,7 +875,7 @@ defineclass rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id)); } - if (super != rb_cObject) { + if (VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) { VALUE tmp; tmp = rb_class_real(RCLASS_SUPER(klass)); @@ -890,6 +886,9 @@ defineclass } } else { + if (!VM_DEFINECLASS_HAS_SUPERCLASS_P(flags)) { + super = rb_cObject; + } /* new class declaration */ klass = rb_define_class_id(id, super); rb_set_class_path_string(klass, cbase, rb_id2str(id)); |