procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/92446 - deduction of class NTTP.

Browse source 
Another place we need to look through the VIEW_CONVERT_EXPR we add to make a
use of a class NTTP have const type.

	* pt.c (deducible_expression): Look through VIEW_CONVERT_EXPR.

From-SVN: r279228
This commit is contained in:
Jason Merrill 2019-12-11 11:48:22 -05:00 • committed by Jason Merrill
parent 0a22f99639
commit 3e7a892cc5
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,3 +1,8 @@
2019-12-11 Jason Merrill <jason@redhat.com>
PR c++/92446 - deduction of class NTTP.
* pt.c (deducible_expression): Look through VIEW_CONVERT_EXPR.
2019-12-10 Jason Merrill <jason@redhat.com>
PR c++/92847 - C++20 comparison ambiguity with class template.

2
gcc/cp/pt.c
View file

@ -21183,7 +21183,7 @@ static bool
deducible_expression (tree expr)
{
/* Strip implicit conversions. */
while (CONVERT_EXPR_P (expr))
while (CONVERT_EXPR_P (expr) || TREE_CODE (expr) == VIEW_CONVERT_EXPR)
expr = TREE_OPERAND (expr, 0);
return (TREE_CODE (expr) == TEMPLATE_PARM_INDEX);
}

13
gcc/testsuite/g++.dg/cpp2a/nontype-class26.C Normal file
View file

@ -0,0 +1,13 @@
// { dg-do compile { target c++2a } }
struct p { unsigned p_ {}; };
template <p i> struct pp {};
struct qq : public pp <p {}> {};
template <p i> int f (pp <i> const &);
int main ()
{
return f (qq {});
}