GAsync: Fix generating finish method for generic async methods

Fixes bug 654336.

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 607d5f622791de628d0d2fd540c16a6518b29742..9e4d8a9e62c37176a6ec74ede2100c5456204e5f 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -826,7 +826,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                                }
                                type_param_index++;
                        }
-               } else if (!m.closure) {
+               } else if (!m.closure && (direction & 1) == 1) {
                        int type_param_index = 0;
                        foreach (var type_param in m.get_type_parameters ()) {
                                cparam_map.set (get_param_pos (0.1 * type_param_index + 0.01), new CCodeParameter ("%s_type".printf (type_param.name.down ()), "GType"));

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9a2c4e25194f7c8774ea0e125657549d27d355ac..75eaf17dca02e94154df281b8ec472b8c29e81e6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,6 +125,7 @@ TESTS = \
        asynchronous/bug646945.vala \
        asynchronous/bug652252.vala \
        asynchronous/bug653861.vala \
+       asynchronous/bug654336.vala \
        asynchronous/closures.vala \
        dbus/basic-types.test \
        dbus/arrays.test \

diff --git a/tests/asynchronous/bug654336.vala b/tests/asynchronous/bug654336.vala
new file mode 100644 (file)
index 0000000..cbafc85
--- /dev/null
+++ b/tests/asynchronous/bug654336.vala
@@ -0,0 +1,8 @@
+async void foo<T>() { }
+
+async void bar () {
+       yield foo<int> ();
+}
+
+void main () {
+}