diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-05-04 19:22:26 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-05-04 19:22:26 +0000 |
| commit | 68fef9f904e00df927a457fc061aae4feef97824 (patch) | |
| tree | 9c3de964100328ed3c430bb645b4be3c0abe0705 /gcc | |
| parent | 97e3c92355da5e885866e65dd1c1c6903f8611c2 (diff) | |
| download | gcc-68fef9f904e00df927a457fc061aae4feef97824.zip gcc-68fef9f904e00df927a457fc061aae4feef97824.tar.gz gcc-68fef9f904e00df927a457fc061aae4feef97824.tar.bz2 | |
re PR c++/43028 ([C++0x] internal compiler error in maybe_adjust_types_for_deduction)
/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.
From-SVN: r159045
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/initlist31.C | 13 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3f3b68e..e186a5d 100644 --- 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 --- 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 --- 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 diff --git a/gcc/testsuite/g++.dg/cpp0x/initlist31.C b/gcc/testsuite/g++.dg/cpp0x/initlist31.C new file mode 100644 index 0000000..ffc9855 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/initlist31.C @@ -0,0 +1,13 @@ +// PR c++/43028 +// { dg-options "-std=c++0x" } + +#include <initializer_list> + +struct string { string(std::initializer_list<char>) { } }; + +void f() { + auto y = + { + string(Equation()) // { dg-error "not declared" } + }; // { dg-error "unable to deduce" } +} |