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

/cp
2017-02-10  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/71737
	* pt.c (tsubst_decl): Don't try to preserve a typedef that names
	an error_mark_node as type.

/testsuite
2017-02-10  Paolo Carlini  <paolo.carlini@oracle.com>

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

From-SVN: r245327

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f615f908f5e496bc1c6957a764e96b4e035fc322..0c5d1654bad9fae2a58f4ec3325e650bf8952562 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/71737
+       * pt.c (tsubst_decl): Don't try to preserve a typedef that names
+       an error_mark_node as type.
+
 2017-02-09  Jakub Jelinek  <jakub@redhat.com>
            Jason Merrill  <jason@redhat.com>
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 0a4510c8ebee3c07d67050b72d9450571e2d2d30..c23c14c9e38b7b37153e5eefb6cc64be7ab4aaa4 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12877,11 +12877,11 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
                                        args, complain, in_decl);
 
        /* Preserve a typedef that names a type.  */
-       if (is_typedef_decl (r))
+       if (is_typedef_decl (r) && type != error_mark_node)
          {
            DECL_ORIGINAL_TYPE (r) = NULL_TREE;
            set_underlying_type (r);
-           if (TYPE_DECL_ALIAS_P (r) && type != error_mark_node)
+           if (TYPE_DECL_ALIAS_P (r))
              /* An alias template specialization can be dependent
                 even if its underlying type is not.  */
              TYPE_DEPENDENT_P_VALID (TREE_TYPE (r)) = false;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3cf1cb245746f936d20f90213ac29a5837423650..050bd52b15b597333eff5724d63438905a250c66 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
+2017-02-10  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/71737
+       * g++.dg/cpp0x/pr71737.C: New.
+
 2017-02-10  Prasad Ghangal  <prasad.ghangal@gmail.com>
-       Richard Biener  <rguenther@suse.de>
+           Richard Biener  <rguenther@suse.de>
 
        * gcc.dg/gimplefe-error-1.c: New testcase.
        * gcc.dg/gimplefe-error-2.c: New testcase.

diff --git a/gcc/testsuite/g++.dg/cpp0x/pr71737.C b/gcc/testsuite/g++.dg/cpp0x/pr71737.C
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..384d947845286565ce603f3d2ad1c7c228927fdb 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/pr71737.C
+++ b/gcc/testsuite/g++.dg/cpp0x/pr71737.C
@@ -0,0 +1,13 @@
+// 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>;