Support casting nullable structs to non-nullable structs

Fixes bug 588832.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 06f1dda4fa596d600366f1483b67f6d777bf9c8e..32f1b4ab9ea6c38bac2257b0a449497886749201 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -4225,7 +4225,13 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                                }
                        }
 
-                       expr.ccodenode = new CCodeCastExpression ((CCodeExpression) expr.inner.ccodenode, expr.type_reference.get_cname ());
+                       var innercexpr = (CCodeExpression) expr.inner.ccodenode;
+                       if (expr.type_reference.data_type is Struct && !expr.type_reference.nullable &&
+                               expr.inner.value_type.data_type is Struct && expr.inner.value_type.nullable) {
+                               // nullable integer or float or boolean or struct cast to non-nullable
+                               innercexpr = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, innercexpr);
+                       }
+                       expr.ccodenode = new CCodeCastExpression (innercexpr, expr.type_reference.get_cname ());
                }
        }