codegen: Add destroy out-param when invoking delegate returned by delegate

https://bugzilla.gnome.org/show_bug.cgi?id=792077

diff --git a/codegen/valaccodemethodcallmodule.vala b/codegen/valaccodemethodcallmodule.vala
index 67a54c92b10cfebe68bfd633e4053a0ae82c09ce..da64bafac358ed1b508769c3396a80a724f54e2d 100644 (file)
--- a/codegen/valaccodemethodcallmodule.vala
+++ b/codegen/valaccodemethodcallmodule.vala
@@ -596,6 +596,17 @@ public class Vala.CCodeMethodCallModule : CCodeAssignmentModule {
                                out_arg_map.set (get_param_pos (get_ccode_delegate_target_pos (deleg)), new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, temp_ref));
 
                                set_delegate_target (expr, temp_ref);
+
+                               if (deleg_type.is_disposable ()) {
+                                       temp_var = get_temp_variable (gdestroynotify_type);
+                                       temp_ref = get_variable_cexpression (temp_var.name);
+
+                                       emit_temp_var (temp_var);
+
+                                       out_arg_map.set (get_param_pos (get_ccode_delegate_target_pos (deleg) + 0.01), new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, temp_ref));
+
+                                       set_delegate_target_destroy_notify (expr, temp_ref);
+                               }
                        }
                }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 571c9f2b051c12439ff8fdb5e2478add977c9f8a..4ad6f65cb1f10842d5f3fc5a7ac80b7b5697cb70 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -174,6 +174,7 @@ TESTS = \
        delegates/bug703804.vala \
        delegates/bug761360.vala \
        delegates/bug772204.test \
+       delegates/bug792077.vala \
        objects/chainup.vala \
        objects/classes.vala \
        objects/constructors.vala \

diff --git a/tests/delegates/bug792077.vala b/tests/delegates/bug792077.vala
new file mode 100644 (file)
index 0000000..4c29822
--- /dev/null
+++ b/tests/delegates/bug792077.vala
@@ -0,0 +1,16 @@
+delegate void FooFunc (int i);
+delegate FooFunc BarFunc ();
+
+int result = 0;
+
+void main () {
+       BarFunc func_gen = () => {
+               return (data) => {
+                       result = data;
+               };
+       };
+
+       FooFunc func = func_gen ();
+       func (42);
+       assert (result == 42);
+}