From: Marek Polacek Date: Mon, 18 Nov 2019 16:39:24 +0000 (+0000) Subject: PR c++/91962 - ICE with reference binding and qualification conversion. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d2b80ea51e42d5011badf2d654fb3fd93289fe3;p=gcc.git PR c++/91962 - ICE with reference binding and qualification conversion. When fixing c++/91889 (r276251) I was assuming that we couldn't have a ck_qual under a ck_ref_bind, and I was introducing it in the patch and so this + if (next_conversion (convs)->kind == ck_qual) + { + gcc_assert (same_type_p (TREE_TYPE (expr), + next_conversion (convs)->type)); + /* Strip the cast created by the ck_qual; cp_build_addr_expr + below expects an lvalue. */ + STRIP_NOPS (expr); + } in convert_like_real was supposed to handle it. But that assumption was wrong as this test shows; here we have "(int *)f" where f is of type long int, and we're converting it to "const int *const &", so we have both ck_ref_bind and ck_qual. That means that the new STRIP_NOPS strips an expression it shouldn't have, and that then breaks when creating a TARGET_EXPR. So we want to limit the stripping to the new case only. This I do by checking need_temporary_p, which will be 0 in the new case. Yes, we can set need_temporary_p when binding a reference directly, but then we won't have a qualification conversion. It is possible to have a bit-field, convert it to a pointer, and then convert that pointer to a more-qualified pointer, but in that case we're not dealing with an lvalue, so gl_kind is 0, so we won't enter this block in reference_binding: 1747 if ((related_p || compatible_p) && gl_kind) * call.c (convert_like_real) : Check need_temporary_p. * g++.dg/cpp0x/ref-bind7.C: New test. From-SVN: r278416 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4730d792c68..616a04bdd1d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-11-18 Marek Polacek + + PR c++/91962 - ICE with reference binding and qualification conversion. + * call.c (convert_like_real) : Check need_temporary_p. + 2019-11-17 Jakub Jelinek * method.c (lookup_comparison_result): Use %qD instead of %<%T::%D%> diff --git a/gcc/cp/call.c b/gcc/cp/call.c index e9ab30d9e13..13639a1c901 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -7598,7 +7598,8 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum, /* direct_reference_binding might have inserted a ck_qual under this ck_ref_bind for the benefit of conversion sequence ranking. Ignore the conversion; we'll create our own below. */ - if (next_conversion (convs)->kind == ck_qual) + if (next_conversion (convs)->kind == ck_qual + && !convs->need_temporary_p) { gcc_assert (same_type_p (TREE_TYPE (expr), next_conversion (convs)->type)); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c7e4500c497..d8bd2fa3382 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-11-18 Marek Polacek + + PR c++/91962 - ICE with reference binding and qualification conversion. + * g++.dg/cpp0x/ref-bind7.C: New test. + 2019-11-18 Martin Jambor PR ipa/92528 diff --git a/gcc/testsuite/g++.dg/cpp0x/ref-bind7.C b/gcc/testsuite/g++.dg/cpp0x/ref-bind7.C new file mode 100644 index 00000000000..e3675bc560d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/ref-bind7.C @@ -0,0 +1,13 @@ +// PR c++/91962 - ICE with reference binding and qualification conversion. +// { dg-do compile { target c++11 } } + +template class b { +public: + void c(const a &); +}; +class B { + void d(); + b e; +}; +long f; +void B::d() { e.c((const int *)f); }