diff options
| author | Marek Polacek <polacek@redhat.com> | 2018-12-13 20:47:32 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-12-13 20:47:32 +0000 |
| commit | b46e1a69975d64ad436ff1c928e008105b2b2a8d (patch) | |
| tree | 0f98a2372671ce74db10afc5a1628accc70aa17e /gcc | |
| parent | 2b462958e2db15dc6f55ed361d47cdbc62d64ea0 (diff) | |
| download | gcc-b46e1a69975d64ad436ff1c928e008105b2b2a8d.zip gcc-b46e1a69975d64ad436ff1c928e008105b2b2a8d.tar.gz gcc-b46e1a69975d64ad436ff1c928e008105b2b2a8d.tar.bz2 | |
PR c++/88216 - ICE with class type in non-type template parameter.
* mangle.c (write_expression): Handle TARGET_EXPR and
VIEW_CONVERT_EXPR.
* pt.c (convert_nontype_argument): Don't call
get_template_parm_object for value-dependent expressions.
* g++.dg/cpp2a/nontype-class9.C: New test.
From-SVN: r267108
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 10 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/nontype-class9.C | 29 |
5 files changed, 53 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 503bbbb..46557be 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2018-12-13 Marek Polacek <polacek@redhat.com> + + PR c++/88216 - ICE with class type in non-type template parameter. + * mangle.c (write_expression): Handle TARGET_EXPR and + VIEW_CONVERT_EXPR. + * pt.c (convert_nontype_argument): Don't call + get_template_parm_object for value-dependent expressions. + 2018-12-13 Nathan Sidwell <nathan@acm.org> PR c++/87531 diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 64415894..5624788 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -2836,13 +2836,21 @@ write_expression (tree expr) { enum tree_code code = TREE_CODE (expr); + if (TREE_CODE (expr) == TARGET_EXPR) + { + expr = TARGET_EXPR_INITIAL (expr); + code = TREE_CODE (expr); + } + /* Skip NOP_EXPR and CONVERT_EXPR. They can occur when (say) a pointer argument is converted (via qualification conversions) to another type. */ while (CONVERT_EXPR_CODE_P (code) || location_wrapper_p (expr) /* Parentheses aren't mangled. */ || code == PAREN_EXPR - || code == NON_LVALUE_EXPR) + || code == NON_LVALUE_EXPR + || (code == VIEW_CONVERT_EXPR + && TREE_CODE (TREE_OPERAND (expr, 0)) == TEMPLATE_PARM_INDEX)) { expr = TREE_OPERAND (expr, 0); code = TREE_CODE (expr); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 8560e58..3b378ee 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7123,7 +7123,8 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) { /* Replace the argument with a reference to the corresponding template parameter object. */ - expr = get_template_parm_object (expr, complain); + if (!value_dependent_expression_p (expr)) + expr = get_template_parm_object (expr, complain); if (expr == error_mark_node) return NULL_TREE; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 19c82c1..a307687 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-12-13 Marek Polacek <polacek@redhat.com> + + PR c++/88216 - ICE with class type in non-type template parameter. + * g++.dg/cpp2a/nontype-class9.C: New test. + 2018-12-13 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/88416 diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C new file mode 100644 index 0000000..737f712 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class9.C @@ -0,0 +1,29 @@ +// PR c++/88216 +// { dg-do compile { target c++2a } } + +template <class T, class U> struct same; +template <class T> struct same<T,T> {}; + +struct T { }; + +template <T t> +struct U { }; + +template <T t> +void f (U<t>) +{ + same<T,decltype(t)> s; + same<const T&,decltype((t))> s2; +} + +template<T t> +U<t> u; + +T t; +U<t> u2; + +void +g () +{ + f<t>(u2); +} |