OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR c++/88216 - ICE with class type in non-type template parameter.

Browse Source 
* 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
This commit is contained in:
Marek Polacek 2018-12-13 20:47:32 +00:00 committed by Marek Polacek
parent 2b462958e2
commit b46e1a6997
5 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/cp/ChangeLog
View File

@ -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

10
gcc/cp/mangle.c
View File

@ -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);

3
gcc/cp/pt.c
View File

@ -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;
}

5
gcc/testsuite/ChangeLog
View File

@ -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

29
gcc/testsuite/g++.dg/cpp2a/nontype-class9.C Normal file
View File

@ -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);
}