mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 23:51:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Fix ICE with omitted template args [PR93956].

Browse Source 
reshape_init only wants to work on BRACE_ENCLOSED_INITIALIZER_P, i.e. raw
initializer lists, and here was getting a CONSTRUCTOR that had already been
processed for type A<int>.  maybe_aggr_guide should also use that test.

gcc/cp/ChangeLog
2020-03-10  Jason Merrill  <jason@redhat.com>

	PR c++/93956
	* pt.c (maybe_aggr_guide): Check BRACE_ENCLOSED_INITIALIZER_P.
This commit is contained in:
Jason Merrill 2020-03-10 17:51:46 -04:00
parent 37e0df8a9b
commit df15a82804
3 changed files with 13 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 @@
2020-03-10 Jason Merrill <jason@redhat.com>
PR c++/93956
* pt.c (maybe_aggr_guide): Check BRACE_ENCLOSED_INITIALIZER_P.
2020-03-10 Jason Merrill <jason@redhat.com>
PR c++/93922

2
gcc/cp/pt.c
View File

@ -28182,7 +28182,7 @@ maybe_aggr_guide (tree tmpl, tree init, vec<tree,va_gc> *args)
tsubst_flags_t complain = tf_none;
tree parms = NULL_TREE;
if (TREE_CODE (init) == CONSTRUCTOR)
if (BRACE_ENCLOSED_INITIALIZER_P (init))
{
init = reshape_init (type, init, complain);
if (init == error_mark_node)

7
gcc/testsuite/g++.dg/cpp1z/class-deduction70.C Normal file
View File

@ -0,0 +1,7 @@
// PR c++/93596
template <typename> struct A {};
template <typename> struct B {};
template <typename> struct C {
void foo () { B a = A<int> { foo }; } // { dg-error "" }
};