re PR c++/55542 (g++ segmentation fault)
PR c++/55542 * pt.c (make_ith_pack_parameter_name): Return NULL if name is NULL. (tsubst_decl): Call make_ith_pack_parameter_name even if DECL_NAME is NULL. * g++.dg/cpp0x/vt-55542.C: New test. From-SVN: r194010
This commit is contained in:
parent
a37d67b621
commit
55ad8d77ab
|
@ -1,3 +1,11 @@
|
||||||
|
2012-12-01 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
PR c++/55542
|
||||||
|
* pt.c (make_ith_pack_parameter_name): Return NULL if
|
||||||
|
name is NULL.
|
||||||
|
(tsubst_decl): Call make_ith_pack_parameter_name even if
|
||||||
|
DECL_NAME is NULL.
|
||||||
|
|
||||||
2012-11-29 Jason Merrill <jason@redhat.com>
|
2012-11-29 Jason Merrill <jason@redhat.com>
|
||||||
|
|
||||||
PR c++/53137
|
PR c++/53137
|
||||||
|
|
|
@ -2905,6 +2905,8 @@ make_ith_pack_parameter_name (tree name, int i)
|
||||||
char* newname;
|
char* newname;
|
||||||
int newname_len;
|
int newname_len;
|
||||||
|
|
||||||
|
if (name == NULL_TREE)
|
||||||
|
return name;
|
||||||
snprintf (numbuf, NUMBUF_LEN, "%i", i);
|
snprintf (numbuf, NUMBUF_LEN, "%i", i);
|
||||||
newname_len = IDENTIFIER_LENGTH (name)
|
newname_len = IDENTIFIER_LENGTH (name)
|
||||||
+ strlen (numbuf) + 2;
|
+ strlen (numbuf) + 2;
|
||||||
|
@ -10261,10 +10263,9 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
|
||||||
/* Get the Ith type. */
|
/* Get the Ith type. */
|
||||||
type = TREE_VEC_ELT (expanded_types, i);
|
type = TREE_VEC_ELT (expanded_types, i);
|
||||||
|
|
||||||
if (DECL_NAME (r))
|
/* Rename the parameter to include the index. */
|
||||||
/* Rename the parameter to include the index. */
|
DECL_NAME (r)
|
||||||
DECL_NAME (r) =
|
= make_ith_pack_parameter_name (DECL_NAME (r), i);
|
||||||
make_ith_pack_parameter_name (DECL_NAME (r), i);
|
|
||||||
}
|
}
|
||||||
else if (!type)
|
else if (!type)
|
||||||
/* We're dealing with a normal parameter. */
|
/* We're dealing with a normal parameter. */
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2012-12-01 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
PR c++/55542
|
||||||
|
* g++.dg/cpp0x/vt-55542.C: New test.
|
||||||
|
|
||||||
2012-11-30 Eric Botcazou <ebotcazou@adacore.com>
|
2012-11-30 Eric Botcazou <ebotcazou@adacore.com>
|
||||||
|
|
||||||
* gnat.dg/specs/pack9.ads: New test.
|
* gnat.dg/specs/pack9.ads: New test.
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
// PR c++/55542
|
||||||
|
// { dg-options "-std=c++11" }
|
||||||
|
|
||||||
|
template <typename ... P>
|
||||||
|
struct B
|
||||||
|
{
|
||||||
|
template <typename O>
|
||||||
|
B (O *o, void (O::*f) (P ... p)) {}
|
||||||
|
};
|
||||||
|
class C
|
||||||
|
{
|
||||||
|
void foo (void *, int);
|
||||||
|
template <typename ... A>
|
||||||
|
void bar (A ... a);
|
||||||
|
B <void *> c;
|
||||||
|
B <void *, int> d;
|
||||||
|
C (int) : c (this, &C::bar), d (this, &C::foo) {}
|
||||||
|
};
|
||||||
|
template <typename ... A>
|
||||||
|
void C::bar (A ...)
|
||||||
|
{
|
||||||
|
}
|
Loading…
Reference in New Issue