Handle struct equality for simple types and opaque structures.

Fixes bug 618217.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 24b0fb50a339e3a40a6c63624b616499f28144d5..d2f47abcedc32e76c11e10ef9a3dc6dd930ee032 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -2563,7 +2563,17 @@ public class Vala.CCodeBaseModule : CCodeModule {
                        cblock.add_statement (cif);
                }
 
-               cblock.add_statement (new CCodeReturnStatement (new CCodeConstant ("TRUE")));
+               if (st.get_fields().size == 0) {
+                       // either opaque structure or simple type
+                       if (st.is_simple_type ()) {
+                               var cexp = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY, new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("s1")), new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("s2")));
+                               cblock.add_statement (new CCodeReturnStatement (cexp));
+                       } else {
+                               cblock.add_statement (new CCodeReturnStatement (new CCodeConstant ("FALSE")));
+                       }
+               } else {
+                       cblock.add_statement (new CCodeReturnStatement (new CCodeConstant ("TRUE")));
+               }
 
                // append to file