aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.cc
diff options
context:
space:
mode:
authorPatrick Palka <ppalka@redhat.com>2022-12-15 15:38:47 -0500
committerPatrick Palka <ppalka@redhat.com>2022-12-15 15:38:47 -0500
commit38304846d18d6bb14b0fd6c627c5c6d43a814d01 (patch)
tree8f6474af6dd0b50f264b3736c481a7cbbd7965d2 /gcc/cp/pt.cc
parent12abd5a7d13209f79664ea603b3f3517f71b8c4f (diff)
downloadgcc-38304846d18d6bb14b0fd6c627c5c6d43a814d01.zip
gcc-38304846d18d6bb14b0fd6c627c5c6d43a814d01.tar.gz
gcc-38304846d18d6bb14b0fd6c627c5c6d43a814d01.tar.bz2
c++: partial ordering with memfn ptr cst [PR108104]
Here we're triggering an overzealous assert in unify during partial ordering since the member function pointer constants are represented as ordinary CONSTRUCTORs (with TYPE_PTRMEMFUNC_P TREE_TYPE) but the assert expects COMPOUND_LITERAL_P constructors. PR c++/108104 gcc/cp/ChangeLog: * pt.cc (unify) <default>: Relax assert to accept any CONSTRUCTOR parm, not just COMPOUND_LITERAL_P one. gcc/testsuite/ChangeLog: * g++.dg/template/ptrmem33.C: New test.
Diffstat (limited to 'gcc/cp/pt.cc')
-rw-r--r--gcc/cp/pt.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 80110da..efd4eaa 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -24873,7 +24873,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict,
if (is_overloaded_fn (parm) || type_unknown_p (parm))
return unify_success (explain_p);
gcc_assert (EXPR_P (parm)
- || COMPOUND_LITERAL_P (parm)
+ || TREE_CODE (parm) == CONSTRUCTOR
|| TREE_CODE (parm) == TRAIT_EXPR);
expr:
/* We must be looking at an expression. This can happen with