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

revert: re PR c++/71737 (ICE following 2x pack expansion in non-pack with template alias) 

/c-family
2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>

	Revert:
     	2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/71737
	* c-common.c (set_underlying_type): Always set DECL_ORIGINAL_TYPE.

/testsuite
2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>

	Revert:
        2017-01-16  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/71737
	* g++.dg/cpp0x/pr71737.C: New.

From-SVN: r244496
This commit is contained in:
Paolo Carlini 2017-01-16 15:43:06 +00:00 committed by Paolo Carlini
parent 290687fb4e
commit 1ddca3f365
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/c-family/ChangeLog
View File

@ -1,3 +1,11 @@
2017-01-16 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2017-01-16 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71737
* c-common.c (set_underlying_type): Always set DECL_ORIGINAL_TYPE.
2017-01-16 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71737

16
gcc/c-family/c-common.c
View File

@ -7419,18 +7419,16 @@ set_underlying_type (tree x)
if (TYPE_NAME (TREE_TYPE (x)) == 0)
TYPE_NAME (TREE_TYPE (x)) = x;
}
else if (DECL_ORIGINAL_TYPE (x) == NULL_TREE)
else if (TREE_TYPE (x) != error_mark_node
&& DECL_ORIGINAL_TYPE (x) == NULL_TREE)
{
tree tt = TREE_TYPE (x);
DECL_ORIGINAL_TYPE (x) = tt;
if (tt != error_mark_node)
{
tt = build_variant_type_copy (tt);
TYPE_STUB_DECL (tt) = TYPE_STUB_DECL (DECL_ORIGINAL_TYPE (x));
TYPE_NAME (tt) = x;
TREE_USED (tt) = TREE_USED (x);
TREE_TYPE (x) = tt;
}
tt = build_variant_type_copy (tt);
TYPE_STUB_DECL (tt) = TYPE_STUB_DECL (DECL_ORIGINAL_TYPE (x));
TYPE_NAME (tt) = x;
TREE_USED (tt) = TREE_USED (x);
TREE_TYPE (x) = tt;
}
}

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2017-01-16 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
2017-01-16 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/71737
* g++.dg/cpp0x/pr71737.C: New.
2017-01-16 Bill Schmidt <wschmidt@linux.vnet.ibm.com>
* gcc.target/powerpc/swaps-p8-27.c: New.

13
gcc/testsuite/g++.dg/cpp0x/pr71737.C
View File

@ -1,13 +0,0 @@
// PR c++/78765
// { dg-do compile { target c++11 } }
template <template <typename ...> class TT>
struct quote {
template <typename ...Ts>
using apply = TT<Ts...>; // { dg-error "pack expansion" }
};
template <typename>
using to_int_t = int;
using t = quote<quote<to_int_t>::apply>::apply<int>;