r176452 - in /branches/gcc-4_5-branch/gcc: Chan...

[jakub@gcc.gnu.org]

Author: jakub
Date: Tue Jul 19 12:54:34 2011
New Revision: 176452

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=176452
Log:
	Backport from mainline
	2011-05-26  Jakub Jelinek  <jakub@redhat.com>

	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:
    branches/gcc-4_5-branch/gcc/testsuite/g++.dg/eh/cond5.C
Modified:
    branches/gcc-4_5-branch/gcc/ChangeLog
    branches/gcc-4_5-branch/gcc/gimplify.c
    branches/gcc-4_5-branch/gcc/testsuite/ChangeLog