r174273 - in /trunk/gcc: ChangeLog gimplify.c t...

[jakub@gcc.gnu.org]

Author: jakub
Date: Thu May 26 10:25:21 2011
New Revision: 174273

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=174273
Log:
	PR c++/49165
	* gimplify.c (shortcut_cond_r): Don't special case
	COND_EXPRs if they have void type on one of their arms.

	* g++.dg/eh/cond5.C: New test.

Added:
    trunk/gcc/testsuite/g++.dg/eh/cond5.C
Modified:
    trunk/gcc/ChangeLog
    trunk/gcc/gimplify.c
    trunk/gcc/testsuite/ChangeLog