Fix formal_target_type in conditional expressions

Fixes bug 638902.

diff --git a/vala/valaconditionalexpression.vala b/vala/valaconditionalexpression.vala
index 6c7e8d66b3fd964bd11402e1f7049bf75c7f1751..9a6f2c23c86170f1a7d7b64598ca430d9043f92f 100644 (file)
--- a/vala/valaconditionalexpression.vala
+++ b/vala/valaconditionalexpression.vala
@@ -1,6 +1,6 @@
 /* valaconditionalexpression.vala
  *
- * Copyright (C) 2006-2009  Jürg Billeter
+ * Copyright (C) 2006-2011  Jürg Billeter
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -176,6 +176,7 @@ public class Vala.ConditionalExpression : Expression {
                false_block.replace_statement (false_decl, false_stmt);
 
                var ma = new MemberAccess.simple (local.name, source_reference);
+               ma.formal_target_type = formal_target_type;
                ma.target_type = target_type;
                ma.check (analyzer);