[GR-17457] Refactor rb_obj_call_init to pass block argument to `ini…

…tialize`.

PullRequest: truffleruby/3376

CHANGELOG.md

@@ -17,6 +17,7 @@ Bug fixes:
 * Fix `String#unpack("Z")` to not advance after the null byte, like CRuby (#2659, @aardvark179).
 * Fix `Float#round` to avoid losing precision during the rounding process (@aardvark179).
 * Fix `String#insert` to not call a subclassed string method (@bjfish).
+* Fix `rb_obj_call_init` to pass any block argument to the `initialize` method (#2675, @aardvark179).
 
 Compatibility:
 

lib/cext/ABI_check.txt

@@ -1 +1 @@
-3
+4

lib/truffle/truffle/cext.rb

@@ -1217,8 +1217,8 @@ def rb_equal(a, b)
     Primitive.object_same_or_equal(a, b)
   end
 
-  def rb_obj_call_init(obj, args)
-    obj.__send__ :initialize, *args
+  def rb_obj_call_init(obj, args, block)
+    obj.__send__ :initialize, *args, &block
   end
 
   def rb_obj_instance_eval(obj, args, block)

spec/ruby/optional/capi/object_spec.rb

@@ -30,6 +30,7 @@ def to_array
   class ObjectTest
     def initialize
       @foo = 7
+      yield if block_given?
     end
 
     def foo
@@ -88,6 +89,15 @@ def six(a, b, *c, &d); end
       o.initialized.should be_true
       o.arguments.should == [:one, :two]
     end
+
+    it "passes the block to #initialize" do
+      v = nil
+      o = @o.rb_obj_alloc(ObjectTest)
+      @o.rb_obj_call_init(o, 0, []) do
+        v = :foo
+      end
+      v.should == :foo
+    end
   end
 
   describe "rb_is_instance_of" do

src/main/c/cext/object.c

@@ -125,7 +125,7 @@ VALUE rb_equal(VALUE a, VALUE b) {
 }
 
 void rb_obj_call_init(VALUE object, int argc, const VALUE *argv) {
-  RUBY_CEXT_INVOKE_NO_WRAP("rb_obj_call_init", object, rb_ary_new4(argc, argv));
+  RUBY_CEXT_INVOKE_NO_WRAP("rb_obj_call_init", object, rb_ary_new4(argc, argv), rb_block_proc());
 }
 
 // taint status