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

PR c++/85706 - class deduction under decltype

Browse source 
* pt.c (for_each_template_parm_r): Handle DECLTYPE_TYPE.  Clear
	*walk_subtrees whether or not we walked into the operand.
	(type_uses_auto): Only look at deduced contexts.

From-SVN: r260066
This commit is contained in:
Jason Merrill 2018-05-08 22:08:52 -04:00 • committed by Jason Merrill
parent 6f9a76b1a1
commit 655b16da12
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/cp/ChangeLog
View file

@ -1,3 +1,10 @@
2018-05-08 Jason Merrill <jason@redhat.com>
PR c++/85706 - class deduction under decltype
* pt.c (for_each_template_parm_r): Handle DECLTYPE_TYPE. Clear
*walk_subtrees whether or not we walked into the operand.
(type_uses_auto): Only look at deduced contexts.
2018-05-08 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/84588

4
gcc/cp/pt.c
View file

@ -9829,6 +9829,7 @@ for_each_template_parm_r (tree *tp, int *walk_subtrees, void *d)
break;
case TYPEOF_TYPE:
case DECLTYPE_TYPE:
case UNDERLYING_TYPE:
if (pfd->include_nondeduced_p
&& for_each_template_parm (TYPE_VALUES_RAW (t), fn, data,
@ -9836,6 +9837,7 @@ for_each_template_parm_r (tree *tp, int *walk_subtrees, void *d)
pfd->include_nondeduced_p,
pfd->any_fn))
return error_mark_node;
*walk_subtrees = false;
break;
case FUNCTION_DECL:
@ -26862,7 +26864,7 @@ type_uses_auto (tree type)
them. */
if (uses_template_parms (type))
return for_each_template_parm (type, is_auto_r, /*data*/NULL,
/*visited*/NULL, /*nondeduced*/true);
/*visited*/NULL, /*nondeduced*/false);
else
return NULL_TREE;
}

9
gcc/testsuite/g++.dg/concepts/class-deduction2.C Normal file
View file

@ -0,0 +1,9 @@
// PR c++/85706
// { dg-additional-options "-std=c++17 -fconcepts" }
template<class T> struct S {
S(T);
};
template<class = void>
auto f() -> decltype(S(42)); // error