From bda10833d6eb0033a2e1b50e299237a27ee05dd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Sun, 21 Mar 2010 23:13:12 +0100 Subject: [PATCH] Fix struct initialization in async methods --- codegen/valaccodebasemodule.vala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala index 0c0e00be1..1beb9fa08 100644 --- a/codegen/valaccodebasemodule.vala +++ b/codegen/valaccodebasemodule.vala @@ -2208,7 +2208,12 @@ internal class Vala.CCodeBaseModule : CCodeModule { closure_struct.add_field (local.variable_type.get_cname (), get_variable_cname (local.name) + local.variable_type.get_cdeclarator_suffix ()); if (local.initializer != null) { - cfrag.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (local.name)), rhs))); + var st = local.variable_type.data_type as Struct; + if (st != null && (!st.is_simple_type () || st.get_cname () == "va_list") && !local.variable_type.nullable && local.initializer is ObjectCreationExpression) { + cfrag.append (new CCodeExpressionStatement (rhs)); + } else { + cfrag.append (new CCodeExpressionStatement (new CCodeAssignment (new CCodeMemberAccess.pointer (new CCodeIdentifier ("data"), get_variable_cname (local.name)), rhs))); + } } } else { CCodeStatement post_stmt = null; -- 2.47.3