From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 6 May 2024 12:20:21 +0000 (+0200)
Subject: codegen: Use correct ctype for result variable in methods in more cases
X-Git-Tag: 0.56.18~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1b79e20082b4466f6321f89938df49ef14d5b0c;p=thirdparty%2Fvala.git

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

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 05b9a2916..41099ab51 100644
--- 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 369d7f3e3..9cc94a0b9 100644
--- 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;
 }