[ruby-cvs:62566] nagachika:r55402 (ruby_2_3): merge revision(s) 54970: [Backport #12367]

[nagachika at ruby-lang.org]

nagachika	2016-06-14 03:33:28 +0900 (Tue, 14 Jun 2016)

  New Revision: 55402

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55402

  Log:
    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.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/insns.def
    branches/ruby_2_3/test/ruby/test_class.rb
    branches/ruby_2_3/version.h