diff options
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 4 |
1 files changed, 3 insertions, 1 deletions
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)) { |