codegen: Add destroy of parameter in vfunc of delegate property setter

The vfunc of an owned setter requires a destroy parameter. Support for
this was introduced with 1e90d53dba0eff6ec2babd8292676099308dd4f6

Fixes https://gitlab.gnome.org/GNOME/vala/issues/919

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index cbb38398e55deb7ff05f713122b0efd04633c3e8..11151416b507f6fb3bef0fad4dff5e528614cbd1 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -393,6 +393,9 @@ public class Vala.GTypeModule : GErrorModule {
                                }
                        } else if ((prop.property_type is DelegateType) && get_ccode_delegate_target (prop) && ((DelegateType) prop.property_type).delegate_symbol.has_target) {
                                vdeclarator.add_parameter (new CCodeParameter (get_delegate_target_cname ("value"), "gpointer"));
+                               if (prop.set_accessor.value_type.value_owned) {
+                                       vdeclarator.add_parameter (new CCodeParameter (get_delegate_target_destroy_notify_cname ("value"), get_ccode_name (delegate_target_destroy_type)));
+                               }
                        }
 
                        var vdecl = new CCodeDeclaration ("void");

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0d9fcdaf6a0fafe29464ce14c5ed2079ba97e29a..8440a625248a946ca5082e10a94d4ff5df35d901 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -381,6 +381,7 @@ TESTS = \
        objects/property-construct-only-write.test \
        objects/property-construct-only-write-foreign.test \
        objects/property-delegate.vala \
+       objects/property-delegate-owned.vala \
        objects/property-gboxed-nullable.vala \
        objects/property-real-struct-no-accessor.test \
        objects/property-simple-type-struct-nullable.vala \

diff --git a/tests/objects/property-delegate-owned.vala b/tests/objects/property-delegate-owned.vala
new file mode 100644 (file)
index 0000000..12c3e4d
--- /dev/null
+++ b/tests/objects/property-delegate-owned.vala
@@ -0,0 +1,53 @@
+delegate void FooFunc ();
+
+interface IFoo {
+       public abstract FooFunc foo { get; owned set; }
+       public abstract FooFunc bar { get; owned set; }
+}
+
+class Foo : IFoo {
+       FooFunc? _bar;
+
+       public virtual FooFunc foo { get; owned set; }
+
+       public virtual FooFunc bar {
+               get {
+                       return _bar;
+               }
+               owned set {
+                       _bar = (owned) value;
+               }
+       }
+
+       public Foo () {
+               foo = () => {};
+               bar = () => {};
+       }
+}
+
+class Bar : Foo {
+       FooFunc? _bar;
+
+       public override FooFunc foo { get; owned set; }
+
+       public override FooFunc bar {
+               get {
+                       return _bar;
+               }
+               owned set {
+                       _bar = (owned) value;
+               }
+       }
+
+       public Bar () {
+               foo = () => {};
+               bar = () => {};
+       }
+}
+
+void main () {
+       var foo = new Foo ();
+       foo.foo ();
+       var bar = new Bar ();
+       bar.bar ();
+}