OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/63139 (Class-scope typedef overwrites typedef of previously defined class)

Browse Source 
PR c++/63139
	* pt.c (tsubst_pack_expansion): Simplify substitution into T....
	(tsubst): Don't throw away PACK_EXPANSION_EXTRA_ARGS.

From-SVN: r215171
This commit is contained in:
Jason Merrill 2014-09-11 09:50:27 -04:00 committed by Jason Merrill
parent 89632536fc
commit c9e8561ef6
3 changed files with 67 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 @@
2014-09-11 Jason Merrill <jason@redhat.com>
PR c++/63139
* pt.c (tsubst_pack_expansion): Simplify substitution into T....
(tsubst): Don't throw away PACK_EXPANSION_EXTRA_ARGS.
2014-09-10 Jason Merrill <jason@redhat.com> 2014-09-10 Jason Merrill <jason@redhat.com>
PR c++/61659 PR c++/61659

11
gcc/cp/pt.c
View File

@ -9913,6 +9913,11 @@ tsubst_pack_expansion (tree t, tree args, tsubst_flags_t complain,
} }
} }
/* If the expansion is just T..., return the matching argument pack. */
if (!unsubstituted_packs
&& TREE_PURPOSE (packs) == pattern)
return ARGUMENT_PACK_ARGS (TREE_VALUE (packs));
/* We cannot expand this expansion expression, because we don't have /* We cannot expand this expansion expression, because we don't have
all of the argument packs we need. */ all of the argument packs we need. */
if (use_pack_expansion_extra_args_p (packs, len, unsubstituted_packs)) if (use_pack_expansion_extra_args_p (packs, len, unsubstituted_packs))
@ -11831,7 +11836,11 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl)
gen_elem_of_pack_expansion_instantiation will gen_elem_of_pack_expansion_instantiation will
build the resulting pack expansion from it. */ build the resulting pack expansion from it. */
if (PACK_EXPANSION_P (arg)) if (PACK_EXPANSION_P (arg))
arg = PACK_EXPANSION_PATTERN (arg); {
/* Make sure we aren't throwing away arg info. */
gcc_assert (!PACK_EXPANSION_EXTRA_ARGS (arg));
arg = PACK_EXPANSION_PATTERN (arg);
}
} }
} }

51
gcc/testsuite/g++.dg/cpp0x/variadic161.C Normal file
View File

@ -0,0 +1,51 @@
// PR c++/63139
// { dg-do compile { target c++11 } }
template<typename ...T>
struct type_list {};
template<typename ...T>
struct make_type_list
{
using type = type_list<T...>;
};
// The bug disappears if you use make_type_list directly.
template<typename ...T>
using make_type_list_t = typename make_type_list<T...>::type;
struct ContainerEndA {};
template<typename ...Ts>
struct ContainerA
{
using type = make_type_list_t<Ts..., ContainerEndA>;
};
struct ContainerEndB {};
template<typename ...Ts>
struct ContainerB
{
using type = make_type_list_t<Ts..., ContainerEndB>;
};
template<typename T, typename U>
struct is_same
{
static const bool value = false;
};
template<typename T>
struct is_same<T, T>
{
static const bool value = true;
};
#define SA(X) static_assert((X), #X)
SA((is_same<ContainerB<>::type, type_list<ContainerEndB>>::value));
SA((!is_same<ContainerA<>::type, type_list<ContainerEndB>>::value));
SA((!is_same<ContainerA<>::type, ContainerB<>::type>::value));