/cp

2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43028
	* pt.c (unify): Check each elt for error_mark_node.

/testsuite
2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/43028
	* g++.dg/cpp0x/initlist31.C: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159045 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3f3b68e..e186a5d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43028
+       * pt.c (unify): Check each elt for error_mark_node.
+
 2010-05-04  Jason Merrill  <jason@redhat.com>
 
        PR c++/38064

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index fbf9b90..7561d3f 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14468,6 +14468,10 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
       FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (arg), i, elt)
        {
          int elt_strict = strict;
+
+         if (elt == error_mark_node)
+           return 1;
+
          if (!BRACE_ENCLOSED_INITIALIZER_P (elt))
            {
              tree type = TREE_TYPE (elt);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4b2fe7d..8e2ffc9 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR c++/43028
+       * g++.dg/cpp0x/initlist31.C: New.
+
 2010-05-04  Jakub Jelinek  <jakub@redhat.com>
 
        PR c/43981