codegen: Avoid writing C statements with no effect

diff --git a/codegen/valaccodeassignmentmodule.vala b/codegen/valaccodeassignmentmodule.vala
index 5c93d71f99ec9a0c936fb095a029ffa1bcdfba7d..0278e9ed1f8d791e15cc98583d63486d265e844a 100644 (file)
--- a/codegen/valaccodeassignmentmodule.vala
+++ b/codegen/valaccodeassignmentmodule.vala
@@ -180,11 +180,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
 
                ccode.add_expression (codenode);
 
-               if (assignment.parent_node is ExpressionStatement) {
-                       return null;
-               } else {
-                       return lhs;
-               }
+               return lhs;
        }
 
        CCodeExpression? emit_fixed_length_array_assignment (Assignment assignment, ArrayType array_type) {
@@ -205,11 +201,7 @@ public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
 
                ccode.add_expression (ccopy);
 
-               if (assignment.parent_node is ExpressionStatement) {
-                       return null;
-               } else {
-                       return lhs;
-               }
+               return lhs;
        }
 
        public override void visit_assignment (Assignment assignment) {

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index abd7d0e1405f2c8d95d70edb1b0e585cb01dc146..bc7af35b5df0c22867388d694ba7d45e092f9a3f 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -3170,10 +3170,6 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        return;
                }
 
-               if (get_cvalue (stmt.expression) != null) {
-                       ccode.add_expression (get_cvalue (stmt.expression));
-               }
-
                /* free temporary objects and handle errors */
 
                foreach (LocalVariable local in temp_ref_vars) {