2009-04-01  Richard Guenther  <rguenther@suse.de>

	* fold-const.c (fold_plusminus_mult_expr): Do not fold
	i * 4 + 2 to (i * 2 + 1) * 2.

	* gcc.dg/fold-plusmult-2.c: New testcase.

From-SVN: r145403