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

GNOME · May 18, 2024 · 5245a38 · 5245a38
1 parent 7bb6259
commit 5245a38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -364,7 +364,7 @@ bar_get_type (void)
 Foo*
 foo (void)
 {
-	Bar* result;
+	Foo* result;
 	result = NULL;
 	return result;
 }