diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2005-11-03 01:25:13 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2005-11-03 01:25:13 +0000 |
| commit | 3a0588c4e01a7cbeaf3a54360ffaba27fc8caf25 (patch) | |
| tree | 661d0838f488e6d552b82cd1954a06b88e0521ff /gcc | |
| parent | 85ffcaf2920a5e4af5754ec5a1735c5d6b47f037 (diff) | |
| download | gcc-3a0588c4e01a7cbeaf3a54360ffaba27fc8caf25.zip gcc-3a0588c4e01a7cbeaf3a54360ffaba27fc8caf25.tar.gz gcc-3a0588c4e01a7cbeaf3a54360ffaba27fc8caf25.tar.bz2 | |
re PR c++/22434 (ICE in simplify_{,gen_}subreg)
PR c++/22434
* call.c (build_conditional_expr): Do bad conversions, if there's
no other choice.
PR c++/22434
* g++.dg/expr/cond8.C: New test.
From-SVN: r106418
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/expr/cond8.C | 13 |
4 files changed, 22 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8d2ab78..eb52015 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2005-11-02 Mark Mitchell <mark@codesourcery.com> + PR c++/22434 + * call.c (build_conditional_expr): Do bad conversions, if there's + no other choice. + PR c++/24560 * parser.c (cp_parser_postfix_dot_deref_expression): Improve error message for use of overloaded functions on LHS of "." operator. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 77cbe2a..99b8bcb 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3281,13 +3281,13 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3) error ("operands to ?: have different types"); result = error_mark_node; } - else if (conv2 && !conv2->bad_p) + else if (conv2 && (!conv2->bad_p || !conv3)) { arg2 = convert_like (conv2, arg2); arg2 = convert_from_reference (arg2); arg2_type = TREE_TYPE (arg2); } - else if (conv3 && !conv3->bad_p) + else if (conv3 && (!conv3->bad_p || !conv2)) { arg3 = convert_like (conv3, arg3); arg3 = convert_from_reference (arg3); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e71f25c..b52603b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2005-11-02 Mark Mitchell <mark@codesourcery.com> + PR c++/22434 + * g++.dg/expr/cond8.C: New test. + PR c++/24560 * g++.dg/parse/dot1.C: New test. diff --git a/gcc/testsuite/g++.dg/expr/cond8.C b/gcc/testsuite/g++.dg/expr/cond8.C new file mode 100644 index 0000000..f05c81a --- /dev/null +++ b/gcc/testsuite/g++.dg/expr/cond8.C @@ -0,0 +1,13 @@ +// PR c++/22434 +// { dg-options "" } + +struct A +{ + A(void*); + ~A(); +}; + +void foo(const int i, bool b) +{ + b ? A(0) : i; // { dg-error "conversion|initializing" } +} |