diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-03-26 10:20:16 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-05-11 08:30:29 -0400 |
| commit | 3d1c151bc1f4a3231f62dc3af758fb7a19f8f904 (patch) | |
| tree | a69e1d1ccf78a6511d39db772e71a7182a7f2972 | |
| parent | 4df77364f7fd9ce88c012843fff124346e4d3c06 (diff) | |
c++: ICE when building builtin operator->* set [PR103455]
Here when constructing the builtin operator->* candidate set according
to the available conversion functions for the operand types, we end up
considering a candidate with C1=T (through B's dependent conversion
function) and C2=F, during which we crash from DERIVED_FROM_P because
dependent_type_p sees a TEMPLATE_TYPE_PARM outside of a template
context.
Sidestepping the question of whether we should be considering such a
dependent conversion function here in the first place, it seems futile
to test DERIVED_FROM_P for anything other than an actual class type, so
this patch fixes this ICE by simply guarding the DERIVED_FROM_P test
with CLASS_TYPE_P instead of MAYBE_CLASS_TYPE_P.
PR c++/103455
gcc/cp/ChangeLog:
* call.c (add_builtin_candidate) <case MEMBER_REF>: Test
CLASS_TYPE_P instead of MAYBE_CLASS_TYPE_P.
gcc/testsuite/ChangeLog:
* g++.dg/overload/builtin6.C: New test.
(cherry picked from commit 04f19580e8dbdbc7366d0f5fd068aa0cecafdc9d)
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/overload/builtin6.C | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index f8e9de8b17f..9745b484a0e 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2684,7 +2684,7 @@ add_builtin_candidate (struct z_candidate **candidates, enum tree_code code, tree c1 = TREE_TYPE (type1); tree c2 = TYPE_PTRMEM_CLASS_TYPE (type2); - if (MAYBE_CLASS_TYPE_P (c1) && DERIVED_FROM_P (c2, c1) + if (CLASS_TYPE_P (c1) && DERIVED_FROM_P (c2, c1) && (TYPE_PTRMEMFUNC_P (type2) || is_complete (TYPE_PTRMEM_POINTED_TO_TYPE (type2)))) break; diff --git a/gcc/testsuite/g++.dg/overload/builtin6.C b/gcc/testsuite/g++.dg/overload/builtin6.C new file mode 100644 index 00000000000..de192be67ec --- /dev/null +++ b/gcc/testsuite/g++.dg/overload/builtin6.C @@ -0,0 +1,14 @@ +// PR c++/103455 + +struct A { }; + +struct B { + operator A*() const; + template<class T> operator T*() const; +}; + +typedef void (A::*F)(); + +void f(B b, F pmf) { + (b->*pmf)(); +} |