diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2011-09-14 16:19:59 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2011-09-14 16:19:59 +0000 |
| commit | ebb077fc775ca085013742c10fc4273ad600ce6f (patch) | |
| tree | 5cd44a33944cf17c50b93a41a53014daa9bc60b7 | |
| parent | 5699cf3daddec68449397d03038e5afd51c0d7e3 (diff) | |
| download | gcc-ebb077fc775ca085013742c10fc4273ad600ce6f.zip gcc-ebb077fc775ca085013742c10fc4273ad600ce6f.tar.gz gcc-ebb077fc775ca085013742c10fc4273ad600ce6f.tar.bz2 | |
re PR c++/50391 ([C++0x] ICE on invalid code, pair with incomplete type)
/cp
2011-09-14 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50391
* pt.c (regenerate_decl_from_template): Don't pass an error_mark_node
to build_exception_variant.
/testsuite
2011-09-14 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/50391
* g++.dg/cpp0x/noexcept15.C: New.
From-SVN: r178857
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/noexcept15.C | 34 |
4 files changed, 46 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aa4a31d..8b15ca6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-09-14 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50391 + * pt.c (regenerate_decl_from_template): Don't pass an error_mark_node + to build_exception_variant. + 2011-09-13 Dodji Seketeli <dodji@redhat.com> PR c++/48320 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 1407364..ee33daf 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -17729,7 +17729,7 @@ regenerate_decl_from_template (tree decl, tree tmpl) specs = tsubst_exception_specification (TREE_TYPE (code_pattern), args, tf_error, NULL_TREE, /*defer_ok*/false); - if (specs) + if (specs && specs != error_mark_node) TREE_TYPE (decl) = build_exception_variant (TREE_TYPE (decl), specs); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3aa10de..28d1102 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-09-14 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/50391 + * g++.dg/cpp0x/noexcept15.C: New. + 2011-09-14 Tom de Vries <tom@codesourcery.com> PR middle-end/50251 diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept15.C b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C new file mode 100644 index 0000000..5e8c40c --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept15.C @@ -0,0 +1,34 @@ +// PR c++/50391 +// { dg-options -std=c++0x } + +#include <type_traits> + +template<class Tp> + struct single + { + Tp elem; // { dg-error "incomplete type" } + + constexpr single(const Tp& e) + : elem(e) { } // { dg-error "invalid field" } + + single(single&& s) // { dg-error "not a member" } + noexcept(std::is_nothrow_move_constructible<Tp>::value) + : elem(s.elem) { } // { dg-error "invalid field|no member" } + }; + +template<class Tp> + constexpr single<typename std::decay<Tp>::type> + make_single(Tp&& x) + { + return single<typename std::decay<Tp>::type>(x); + } + +class Blob; // { dg-error "forward declaration" } + +void +foo(Blob *b) +{ + make_single(*b); +} + +// { dg-prune-output "include" } |