diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/overload-conv-4.C | 23 |
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fda743b..6b19375 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-10-29 Marek Polacek <polacek@redhat.com> + + PR c++/90998 - ICE with copy elision in init by ctor and -Wconversion. + * call.c (joust): Don't attempt to warn if ->second_conv is null. + 2019-10-29 Jakub Jelinek <jakub@redhat.com> PR c++/92201 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index cbd1fe8..b0c6370 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -10870,7 +10870,9 @@ joust (struct z_candidate *cand1, struct z_candidate *cand2, bool warn, either between a constructor and a conversion op, or between two conversion ops. */ if ((complain & tf_warning) - && winner && warn_conversion && cand1->second_conv + /* In C++17, the constructor might have been elided, which means that + an originally null ->second_conv could become non-null. */ + && winner && warn_conversion && cand1->second_conv && cand2->second_conv && (!DECL_CONSTRUCTOR_P (cand1->fn) || !DECL_CONSTRUCTOR_P (cand2->fn)) && winner != compare_ics (cand1->second_conv, cand2->second_conv)) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3761a99..db443f7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-29 Marek Polacek <polacek@redhat.com> + + PR c++/90998 - ICE with copy elision in init by ctor and -Wconversion. + * g++.dg/cpp0x/overload-conv-4.C: New test. + 2019-10-29 Jakub Jelinek <jakub@redhat.com> PR c++/92201 diff --git a/gcc/testsuite/g++.dg/cpp0x/overload-conv-4.C b/gcc/testsuite/g++.dg/cpp0x/overload-conv-4.C new file mode 100644 index 0000000..6fcdbba --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/overload-conv-4.C @@ -0,0 +1,23 @@ +// PR c++/90998 - ICE with copy elision in init by ctor and -Wconversion. +// { dg-do compile { target c++11 } } +// { dg-options "-Wconversion" } + +struct B; + +struct A { + operator B(); +}; + +struct B { + B(A const &rs); + B(B const &rs); +}; + +B +f (A x) +{ + // C++14: we call B::B(A const &) + // C++17: we call A::operator B() + return B(x); // { dg-warning "choosing .A::operator B\\(\\). over .B::B\\(const A&\\)" "" { target c++17 } } + // { dg-warning "for conversion from .A. to .B." "" { target c++17 } .-1 } +} |