codegen: Use correct ctype for result variable in methods in more cases

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 05b9a29166da1d5e271fa9b4db98adf67aa494cf..41099ab5149c720d06c20e16add5f06de5c8ad0a 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -831,7 +831,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                        } else {
                                vardecl = new CCodeVariableDeclarator ("result");
                        }
-                       ccode.add_declaration (get_ccode_name (m.return_type), vardecl);
+                       ccode.add_declaration (get_creturn_type (m, get_ccode_name (m.return_type)), vardecl);
                }
 
                pop_context ();
@@ -1210,7 +1210,7 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
                        } else {
                                vardecl = new CCodeVariableDeclarator ("result");
                        }
-                       ccode.add_declaration (get_ccode_name (m.return_type), vardecl);
+                       ccode.add_declaration (get_creturn_type (m, get_ccode_name (m.return_type)), vardecl);
                }
 
                // add a typecheck statement for "self"

diff --git a/tests/methods/bug699956.c-expected b/tests/methods/bug699956.c-expected
index 80ecda19936df20078ca9be6df9f2ee8646ba99d..1771aa315352fa93eb8d0bf03fa0d227ab19d228 100644 (file)
--- a/tests/methods/bug699956.c-expected
+++ b/tests/methods/bug699956.c-expected
@@ -364,7 +364,7 @@ bar_get_type (void)
 Foo*
 foo (void)
 {
-       Bar* result;
+       Foo* result;
        result = NULL;
        return result;
 }