[ruby/ostruct] Avoid calling initialize

Merged: https://github.com/ruby/ruby/pull/3593

lib/ostruct.rb

@@ -121,11 +121,10 @@ class OpenStruct
   #   data   # => #<OpenStruct country="Australia", capital="Canberra">
   #
   def initialize(hash=nil)
-    @table = {}
     if hash
-      hash.each_pair do |k, v|
+      update_to_values!(hash)
-        set_ostruct_member_value!(k, v)
+    else
-      end
+      @table = {}
     end
   end
 
@@ -137,7 +136,14 @@ class OpenStruct
 
   private def initialize_dup(orig) # :nodoc:
     super
-    initialize(@table)
+    update_to_values!(@table)
+  end
+
+  private def update_to_values!(hash) # :nodoc:
+    @table = {}
+    hash.each_pair do |k, v|
+      set_ostruct_member_value!(k, v)
+    end
   end
 
   #

test/ostruct/test_ostruct.rb

@@ -204,6 +204,15 @@ class TC_OpenStruct < Test::Unit::TestCase
     assert_instance_of(c, os)
   end
 
+  def test_initialize_subclass
+    c = Class.new(OpenStruct) {
+      def initialize(x,y={})super(y);end
+    }
+    o = c.new(1, {a: 42})
+    assert_equal(42, o.dup.a)
+    assert_equal(42, o.clone.a)
+  end
+
   def test_private_method
     os = OpenStruct.new
     class << os