diff options
| author | Jason Merrill <jason@redhat.com> | 2011-02-10 11:29:58 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-02-10 11:29:58 -0500 |
| commit | cb8384a3f592146069847a1f608a4b17fe0dfada (patch) | |
| tree | 0576ee393b8a8de0a6989232641204a9f44c78b0 | |
| parent | 69f36ba6bd980b7a0a426beec9e6b2c495d129b4 (diff) | |
| download | gcc-cb8384a3f592146069847a1f608a4b17fe0dfada.zip gcc-cb8384a3f592146069847a1f608a4b17fe0dfada.tar.gz gcc-cb8384a3f592146069847a1f608a4b17fe0dfada.tar.bz2 | |
* cvt.c (convert_to_void): Handle null op1.
From-SVN: r170007
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/regress/ext-cond1.C | 4 |
4 files changed, 16 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 26de2b6..7d9667d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ 2011-02-09 Jason Merrill <jason@redhat.com> + * cvt.c (convert_to_void): Handle null op1. + * class.c (type_has_constexpr_default_constructor): Make sure the caller stripped an enclosing array. * init.c (perform_member_init): Strip arrays before calling it. diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 029aec3..36c0703 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -892,20 +892,24 @@ convert_to_void (tree expr, impl_conv_void implicit, tsubst_flags_t complain) /* The two parts of a cond expr might be separate lvalues. */ tree op1 = TREE_OPERAND (expr,1); tree op2 = TREE_OPERAND (expr,2); - bool side_effects = TREE_SIDE_EFFECTS (op1) || TREE_SIDE_EFFECTS (op2); + bool side_effects = ((op1 && TREE_SIDE_EFFECTS (op1)) + || TREE_SIDE_EFFECTS (op2)); tree new_op1, new_op2; + new_op1 = NULL_TREE; if (implicit != ICV_CAST && !side_effects) { - new_op1 = convert_to_void (op1, ICV_SECOND_OF_COND, complain); + if (op1) + new_op1 = convert_to_void (op1, ICV_SECOND_OF_COND, complain); new_op2 = convert_to_void (op2, ICV_THIRD_OF_COND, complain); } else { - new_op1 = convert_to_void (op1, ICV_CAST, complain); + if (op1) + new_op1 = convert_to_void (op1, ICV_CAST, complain); new_op2 = convert_to_void (op2, ICV_CAST, complain); } - expr = build3 (COND_EXPR, TREE_TYPE (new_op1), + expr = build3 (COND_EXPR, TREE_TYPE (new_op2), TREE_OPERAND (expr, 0), new_op1, new_op2); break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8d7e387..97d2caf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,7 @@ 2011-02-09 Jason Merrill <jason@redhat.com> + * g++.dg/cpp0x/regress/ext-cond1.C: Copy from ext/cond1.C. + * g++.dg/cpp0x/regress/abi-empty7.C: New. * g++.dg/cpp0x/regress: New directory. diff --git a/gcc/testsuite/g++.dg/cpp0x/regress/ext-cond1.C b/gcc/testsuite/g++.dg/cpp0x/regress/ext-cond1.C new file mode 100644 index 0000000..dc9814e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/regress/ext-cond1.C @@ -0,0 +1,4 @@ +// PR c++/12515 +// { dg-do compile } +// { dg-options "-std=gnu++0x" } +template<int> void foo() { 0 ?: 0; } |