vala: No-accessor struct properties in GLib.Object class must be owned

Real structs are returned as heap-allocated structor by g_object_get() and
not defining them with owned getter results in memory leaks.

Additionally force DelegateType, PointerType and ValueType as unowned to
preserve the current behaviour for binding generation.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4527506aa484b33e6b9c8f592d4f851a4af627ad..57e784b61c27cadb7fe3ac6a200324f624627fa6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -317,6 +317,7 @@ TESTS = \
        objects/property-construct-only-write.test \
        objects/property-construct-only-write-foreign.test \
        objects/property-gboxed-nullable.vala \
+       objects/property-real-struct-no-accessor.test \
        objects/property-static.vala \
        objects/regex.vala \
        objects/signals.vala \

diff --git a/tests/objects/property-real-struct-no-accessor.test b/tests/objects/property-real-struct-no-accessor.test
new file mode 100644 (file)
index 0000000..c2c956b
--- /dev/null
+++ b/tests/objects/property-real-struct-no-accessor.test
@@ -0,0 +1,13 @@
+Invalid Code
+
+struct Foo {
+       public int i;
+}
+
+class Bar : Object {
+       [NoAccessorMethod]
+       public Foo foo { get; set; }
+}
+
+void main () {
+}

diff --git a/vala/valapropertyaccessor.vala b/vala/valapropertyaccessor.vala
index f9fc981713e3244d8499ce05aa73c4746c43c27f..3c826737b7927687cde3c0a656ae37b390da75bf 100644 (file)
--- a/vala/valapropertyaccessor.vala
+++ b/vala/valapropertyaccessor.vala
@@ -158,6 +158,23 @@ public class Vala.PropertyAccessor : Subroutine {
                        value_parameter = new Parameter ("value", value_type, source_reference);
                }
 
+               if (readable && ((TypeSymbol) prop.parent_symbol).is_subtype_of (context.analyzer.object_type)) {
+                       //FIXME Code duplication with CCodeMemberAccessModule.visit_member_access()
+                       if (prop.get_attribute ("NoAccessorMethod") != null) {
+                               if (value_type.is_real_struct_type ()) {
+                                       if (source_reference == null || source_reference.file == null) {
+                                               // Hopefully good as is
+                                       } else if (!value_type.value_owned && source_reference.file.file_type == SourceFileType.SOURCE) {
+                                               Report.error (source_reference, "unowned return value for getter of property `%s' not supported without accessor".printf (prop.get_full_name ()));
+                                       }
+                               } else if (value_type.value_owned && (source_reference == null || source_reference.file == null)) {
+                                       if (value_type is DelegateType || value_type is PointerType || (value_type is ValueType && !value_type.nullable)) {
+                                               value_type.value_owned = false;
+                                       }
+                               }
+                       }
+               }
+
                if (prop.source_type == SourceFileType.SOURCE) {
                        if (body == null && !prop.interface_only && !prop.is_abstract) {
                                /* no accessor body specified, insert default body */