diff options
| author | Patrick Palka <ppalka@redhat.com> | 2020-04-21 10:56:57 -0400 |
|---|---|---|
| committer | Patrick Palka <ppalka@redhat.com> | 2020-04-21 10:56:57 -0400 |
| commit | 08d6ec14e654292340ccc6aa5612bbd91d4d57e8 (patch) | |
| tree | a0ebe0da9ad73b875f0ec24408d16429fe71ebe2 | |
| parent | 6c0ab626113ef20ee2986cb8a102b5394aeb888a (diff) | |
| download | gcc-08d6ec14e654292340ccc6aa5612bbd91d4d57e8.zip gcc-08d6ec14e654292340ccc6aa5612bbd91d4d57e8.tar.gz gcc-08d6ec14e654292340ccc6aa5612bbd91d4d57e8.tar.bz2 | |
c++: Dependent conversion operator in concept [PR94597]
When building the parameter mapping for an atomic constraint,
find_template_parameters does not spot the template parameter within the
conversion-type-id of a dependent conversion operator, which later leads to an
ICE during substitution when looking up the missing template argument for this
unnoticed template parameter.
gcc/cp/ChangeLog:
PR c++/94597
* pt.c (any_template_parm_r) <case IDENTIFIER_NODE>: New case. If this
is a conversion operator, visit its TREE_TYPE.
gcc/testsuite/ChangeLog:
PR c++/94597
* g++.dg/cpp2a/concepts-conv2.C: New test.
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/concepts-conv2.C | 19 |
4 files changed, 36 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 81647d4..372fd08 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2020-04-21 Patrick Palka <ppalka@redhat.com> + + PR c++/94597 + * pt.c (any_template_parm_r) <case IDENTIFIER_NODE>: New case. If this + is a conversion operator, visit its TREE_TYPE. + 2020-04-21 Nathan Sidwell <nathan@acm.org> * pt.c (tsubst_copy_and_build) [POINTER_PLUS_EXPR]: Check for diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 6f74c27..0fc5b24 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -10529,6 +10529,12 @@ any_template_parm_r (tree t, void *data) } break; + case IDENTIFIER_NODE: + if (IDENTIFIER_CONV_OP_P (t)) + /* The conversion-type-id of a conversion operator may be dependent. */ + WALK_SUBTREE (TREE_TYPE (t)); + break; + default: break; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0de5a47..1f3fb60 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-04-21 Patrick Palka <ppalka@redhat.com> + + PR c++/94597 + * g++.dg/cpp2a/concepts-conv2.C: New test. + 2020-04-21 Duan bo <duanbo3@huawei.com> PR target/94577 diff --git a/gcc/testsuite/g++.dg/cpp2a/concepts-conv2.C b/gcc/testsuite/g++.dg/cpp2a/concepts-conv2.C new file mode 100644 index 0000000..821042f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/concepts-conv2.C @@ -0,0 +1,19 @@ +// PR c++/94597 +// { dg-do compile { target c++2a } } + +template <typename b, typename c> concept d = requires(b e) { e.operator c(); }; + +template <typename f, typename g> requires(d<f, g>) bool equal(f, g); + +template <typename h> struct i { + i(h); + operator h(); +}; + +static_assert( d<i<float>, float>); +static_assert(!d<i<float>, int>); + +bool fun() { + i a(2.0f); + return equal(a, 3.0f); +} |