mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-01 12:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Fix crash with broken deduction from {} [PR97895]

Browse Source 
Unfortunately, the otherwise beautiful

  for (constructor_elt &elt : *CONSTRUCTOR_ELTS (init))

is not immune to an empty constructor, so we have to check
CONSTRUCTOR_ELTS first.

gcc/cp/ChangeLog:

	PR c++/97895
	* pt.c (do_auto_deduction): Don't crash when the constructor has
	zero elements.

gcc/testsuite/ChangeLog:

	PR c++/97895
	* g++.dg/cpp0x/auto54.C: New test.
This commit is contained in:
Marek Polacek 2020-11-18 22:49:59 -05:00
parent e1f07131e2
commit 25056bdf94
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/cp/pt.c
View File

@ -29250,10 +29250,13 @@ do_auto_deduction (tree type, tree init, tree auto_node,
return error_mark_node;
if (BRACE_ENCLOSED_INITIALIZER_P (init))
/* We don't recurse here because we can't deduce from a nested
initializer_list. */
for (constructor_elt &elt : *CONSTRUCTOR_ELTS (init))
elt.value = resolve_nondeduced_context (elt.value, complain);
{
/* We don't recurse here because we can't deduce from a nested
initializer_list. */
if (CONSTRUCTOR_ELTS (init))
for (constructor_elt &elt : *CONSTRUCTOR_ELTS (init))
elt.value = resolve_nondeduced_context (elt.value, complain);
}
else
init = resolve_nondeduced_context (init, complain);

10
gcc/testsuite/g++.dg/cpp0x/auto54.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/97895
// { dg-do compile { target c++11 } }
namespace std {
template<typename T> struct initializer_list {
const T *ptr;
decltype(sizeof 0) n;
};
auto a = {}; // { dg-error "unable to deduce" }
}