Fix marshalling of pg tuples.

PullRequest: truffleruby/748

Author: aardvark179

lib/truffle/truffle/cext.rb

@@ -620,6 +620,23 @@ def rb_obj_instance_variables(object)
     object.instance_variables
   end
 
+  def rb_copy_generic_ivar(clone, original)
+    Truffle.check_frozen(clone)
+    original_ivars = original.instance_variables
+    rb_free_generic_ivar(clone)
+    original_ivars.each do |var|
+      clone.instance_variable_set(var, original.instance_variable_get(var))
+    end
+  end
+
+  def rb_free_generic_ivar(original)
+    Truffle.check_frozen(original)
+    original_ivars = original.instance_variables
+    original_ivars.each do |var|
+      original.__send__ :remove_instance_variable, var
+    end
+  end
+
   def rb_inspect(object)
     Truffle::Type.rb_inspect(object)
   end

spec/ruby/optional/capi/ext/object_spec.c

@@ -327,6 +327,16 @@ static VALUE object_spec_rb_ivar_defined(VALUE self, VALUE obj, VALUE sym_name)
   return rb_ivar_defined(obj, SYM2ID(sym_name));
 }
 
+static VALUE object_spec_rb_copy_generic_ivar(VALUE self, VALUE clone, VALUE obj) {
+  rb_copy_generic_ivar(clone, obj);
+  return self;
+}
+
+static VALUE object_spec_rb_free_generic_ivar(VALUE self, VALUE obj) {
+  rb_free_generic_ivar(obj);
+  return self;
+}
+
 static VALUE object_spec_rb_equal(VALUE self, VALUE a, VALUE b) {
   return rb_equal(a, b);
 }
@@ -400,6 +410,8 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_ivar_get", object_spec_rb_ivar_get, 2);
   rb_define_method(cls, "rb_ivar_set", object_spec_rb_ivar_set, 3);
   rb_define_method(cls, "rb_ivar_defined", object_spec_rb_ivar_defined, 2);
+  rb_define_method(cls, "rb_copy_generic_ivar", object_spec_rb_copy_generic_ivar, 2);
+  rb_define_method(cls, "rb_free_generic_ivar", object_spec_rb_free_generic_ivar, 1);
 }
 
 #ifdef __cplusplus

spec/ruby/optional/capi/object_spec.rb

@@ -853,5 +853,24 @@ def reach
         @o.rb_ivar_defined(@test, :bar).should == false
       end
     end
+
+    describe "rb_copy_generic_ivar" do
+      it "copies the instance variables from one object to another" do
+        original = Object.new
+        original.instance_variable_set(:@foo, :bar)
+        clone = Object.new
+        @o.rb_copy_generic_ivar(clone, original)
+        clone.instance_variable_get(:@foo).should == :bar
+      end
+    end
+
+    describe "rb_free_generic_ivar" do
+      it "removes the instance variables from an object" do
+        o = Object.new
+        o.instance_variable_set(:@baz, :flibble)
+        @o.rb_free_generic_ivar(o)
+        o.instance_variables.should == []
+      end
+    end
   end
 end

src/main/c/cext/ruby.c

@@ -1276,6 +1276,9 @@ int rb_tr_flags(VALUE value) {
   if (OBJ_TAINTED(value)) {
     flags |= RUBY_FL_TAINT;
   }
+  if (RARRAY_LEN(rb_obj_instance_variables(value)) > 0) {
+    flags |= RUBY_FL_EXIVAR;
+  }
   // TODO BJF Nov-11-2017 Implement more flags
   return flags;
 }
@@ -4403,11 +4406,11 @@ void rb_alias_variable(ID name1, ID name2) {
 }
 
 void rb_copy_generic_ivar(VALUE clone, VALUE obj) {
-  rb_tr_error("rb_copy_generic_ivar not implemented");
+  RUBY_CEXT_INVOKE_NO_WRAP("rb_copy_generic_ivar", clone, obj);
 }
 
 void rb_free_generic_ivar(VALUE obj) {
-  rb_tr_error("rb_free_generic_ivar not implemented");
+  RUBY_CEXT_INVOKE_NO_WRAP("rb_free_generic_ivar", obj);
 }
 
 void rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) {