fix a bug in reducing embedded assignments

src/ExpressionAssign.h

@@ -71,8 +71,9 @@ class ExpressionAssign : public Expression
 	virtual std::vector<const ExpressionVariable*> get_dereferenced_ptrs(void) const { return assign->get_dereferenced_ptrs();}
 	virtual void get_referenced_ptrs(std::vector<const Variable*>& ptrs) const { assign->get_referenced_ptrs(ptrs);}
 
-	const Expression* get_rhs(void) const { return assign->get_rhs();}
+	const Expression* get_rhs(void) const { return assign->get_expr();}
 	const Lhs* get_lhs(void) const { return assign->get_lhs();}
+	const StatementAssign* get_stm_assign(void) const { return assign;}
 	void Output(std::ostream &) const;
 	virtual void indented_output(std::ostream &out, int indent) const;
 

src/Reducer.cpp

@@ -1370,6 +1370,21 @@ Reducer::output_expr(const Expression* e, std::ostream &out)
 			}
 		}
 	}
+	else if (e->term_type == eAssignment) {
+		const ExpressionAssign* ea = dynamic_cast<const ExpressionAssign*>(e);
+		ostringstream oss;
+		// if RHS can be simplified, print the simplified version
+		if (output_expr(ea->get_rhs(), oss)) {
+			out << "(";
+			ea->get_lhs()->Output(out);
+			out << " ";
+			ea->get_stm_assign()->output_op(out);
+			out << " ";
+			out << oss.str();
+			out << ")";
+			return 1;
+		}
+	}
 	return 0;
 }
 

src/StatementAssign.cpp

@@ -397,10 +397,10 @@ StatementAssign::~StatementAssign(void)
 }
 
 /*
- *
+ * output assign operator
  */
-static void
-OutputAssignOp(eAssignOps op, std::ostream &out)
+void
+StatementAssign::output_op(std::ostream &out) const
 {
 	switch (op) {
 	case eSimpleAssign: out << "="; break;
@@ -441,21 +441,21 @@ StatementAssign::OutputSimple(std::ostream &out) const
 	default:
 		lhs.Output(out);
 		out << " ";
-		OutputAssignOp(op, out);
+		output_op(out);
 		out << " ";
 		expr.Output(out);
 		break;
 
 	case ePreIncr:
 	case ePreDecr:
-		OutputAssignOp(op, out);
+		output_op(out);
 		lhs.Output(out);
 		break;
 
 	case ePostIncr:
 	case ePostDecr:
 		lhs.Output(out);
-		OutputAssignOp(op, out);
+		output_op(out);
 		break;
 	}
 }
@@ -478,14 +478,13 @@ StatementAssign::OutputAsExpr(std::ostream &out) const
 			lhs.Output(out);
 			out << " ";
 			if (CGOptions::ccomp() && (bop != MAX_BINARY_OP) && (lhs.is_volatile())) {
-				OutputAssignOp(eSimpleAssign, out);
-				out << " ";
+				out << "=" << " ";
 				lhs.Output(out);
 				out << " " << FunctionInvocationBinary::get_binop_string(bop) << " ";
 				expr.Output(out);
 			}
 			else {
-				OutputAssignOp(op, out);
+				output_op(out);
 				out << " ";
 				expr.Output(out);
 			}

src/StatementAssign.h

@@ -117,6 +117,7 @@ class StatementAssign : public Statement
 	virtual bool has_uncertain_call_recursive(void) const;
 
 	virtual void Output(std::ostream &out, FactMgr* fm, int indent = 0) const;
+	void output_op(std::ostream &out) const;
 
 	// XXX --- This should go away, once assignments are properly modeled as
 	// expressions.