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

Fix mangling ICE [PR94027]

Browse Source 
PR c++/94027
	* mangle.c (find_substitution): Don't call same_type_p on template
	args that cannot match.

Now same_type_p rejects argument packs, we need to be more careful
calling it with template argument vector contents.

The mangler needs to do some comparisons to find the special
substitutions.  While that code looks a little ugly, this seems the
smallest fix.
This commit is contained in:
Nathan Sidwell 2020-03-06 10:51:26 -08:00
parent 0b83932211
commit 191bcd0f30
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2020-03-06 Nathan Sidwell <nathan@acm.org>
PR c++/94027
* mangle.c (find_substitution): Don't call same_type_p on template
args that cannot match.
2020-03-04 Martin Sebor <msebor@redhat.com>
PR c++/90938

4
gcc/cp/mangle.c
View File

@ -628,6 +628,8 @@ find_substitution (tree node)
{
tree args = CLASSTYPE_TI_ARGS (type);
if (TREE_VEC_LENGTH (args) == 3
&& (TREE_CODE (TREE_VEC_ELT (args, 0))
== TREE_CODE (char_type_node))
&& same_type_p (TREE_VEC_ELT (args, 0), char_type_node)
&& is_std_substitution_char (TREE_VEC_ELT (args, 1),
SUBID_CHAR_TRAITS)
@ -652,7 +654,7 @@ find_substitution (tree node)
args <char, std::char_traits<char> > . */
tree args = CLASSTYPE_TI_ARGS (type);
if (TREE_VEC_LENGTH (args) == 2
&& TYPE_P (TREE_VEC_ELT (args, 0))
&& TREE_CODE (TREE_VEC_ELT (args, 0)) == TREE_CODE (char_type_node)
&& same_type_p (TREE_VEC_ELT (args, 0), char_type_node)
&& is_std_substitution_char (TREE_VEC_ELT (args, 1),
SUBID_CHAR_TRAITS))

22
gcc/testsuite/g++.dg/pr94027.C Normal file
View File

@ -0,0 +1,22 @@
// { dg-do compile { target c++11 } }
// PR 94027 ICE mangling
class a {
public:
a (char);
};
struct b {
b (a);
};
template <typename... aw, int...>
void ax (int)
{
struct c : b {
c () : b {sizeof...(aw)}
{}
};
}
void az() {
ax ({});
}