re PR c++/56543 (ICE on valid code in copy_node_stat)

	PR c++/56543
	* tree.c (strip_typedefs): Don't copy args if they are NULL.

	* g++.dg/template/typename20.C: New test.

From-SVN: r196492

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f342c5e33c6b2f4a34597a19a638921d1085927..3c6c818aebcf8861c46fea1d19ba18640d4037a7 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/56543
+       * tree.c (strip_typedefs): Don't copy args if they are NULL.
+
 2013-02-22  Jason Merrill  <jason@redhat.com>
 
        PR c++/40405

diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 8909c72bb8c85fc79be7934ea31cd36dc8c1df58..b4a538645daaaa5a3fd15f215df96cca4bc54176 100644 (file)
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1209,7 +1209,8 @@ strip_typedefs (tree t)
     case TYPENAME_TYPE:
       {
        tree fullname = TYPENAME_TYPE_FULLNAME (t);
-       if (TREE_CODE (fullname) == TEMPLATE_ID_EXPR)
+       if (TREE_CODE (fullname) == TEMPLATE_ID_EXPR
+           && TREE_OPERAND (fullname, 1))
          {
            tree args = TREE_OPERAND (fullname, 1);
            tree new_args = copy_node (args);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 52bd7f90eac13ded219200f244f0f77909eca943..ca8c8f011d08c75bb8578d9f62ce1c6578003f5b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-06  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c++/56543
+       * g++.dg/template/typename20.C: New test.
+
 2013-03-01  Richard Biener  <rguenther@suse.de>
 
        Backport from mainline

diff --git a/gcc/testsuite/g++.dg/template/typename20.C b/gcc/testsuite/g++.dg/template/typename20.C
new file mode 100644 (file)
index 0000000..d5bd51f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/typename20.C
@@ -0,0 +1,11 @@
+// PR c++/56543
+
+template <typename>
+struct S;
+
+template <typename T>
+struct U
+{
+  typedef typename S <T>::template V <> W;
+  S <W> x;
+};