diff options
| author | Patrick Palka <ppalka@redhat.com> | 2022-03-26 10:20:16 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2022-03-26 10:20:16 -0400 |
| commit | 04f19580e8dbdbc7366d0f5fd068aa0cecafdc9d (patch) | |
| tree | 39273eb9e1a7b1a695fbf64096396ad866ce1fdd /gcc/cp/call.cc | |
| parent | ede5f5224d55b84b9f186b288164df9c06fd85e7 (diff) | |
| download | gcc-04f19580e8dbdbc7366d0f5fd068aa0cecafdc9d.zip gcc-04f19580e8dbdbc7366d0f5fd068aa0cecafdc9d.tar.gz gcc-04f19580e8dbdbc7366d0f5fd068aa0cecafdc9d.tar.bz2 | |
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.cc (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.
Diffstat (limited to 'gcc/cp/call.cc')
| -rw-r--r-- | gcc/cp/call.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index ec6c5d5..dfe370d 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -2821,7 +2821,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; |