diff options
| author | Jason Merrill <jason@redhat.com> | 2011-06-08 17:35:02 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-06-08 17:35:02 -0400 |
| commit | 1026172832d7175b52ee0ddf5ef17d7f5b803e2e (patch) | |
| tree | ee6f3f833ee964ac09575df2a56cdaf0ded1d159 /gcc/cp/except.c | |
| parent | 535fb6eb200870e582a7f4abf2ea929cfc7e24c6 (diff) | |
| download | gcc-1026172832d7175b52ee0ddf5ef17d7f5b803e2e.zip gcc-1026172832d7175b52ee0ddf5ef17d7f5b803e2e.tar.gz gcc-1026172832d7175b52ee0ddf5ef17d7f5b803e2e.tar.bz2 | |
re PR c++/49107 ([C++0x][4.7 Regression] incomplete type regression with std::pair)
PR c++/49107
* cp-tree.def (DEFERRED_NOEXCEPT): New.
* cp-tree.h (struct tree_deferred_noexcept): New.
(DEFERRED_NOEXCEPT_PATTERN, DEFERRED_NOEXCEPT_ARGS): New.
(DEFERRED_NOEXCEPT_SPEC_P): New.
(enum cp_tree_node_structure_enum): Add TS_CP_DEFERRED_NOEXCEPT.
(union lang_tree_node): Add tree_deferred_noexcept.
(maybe_instantiate_noexcept): Declare.
* cp-objcp-common.c (cp_tree_size): Handle DEFERRED_NOEXCEPT.
* error.c (dump_exception_spec): Likewise.
* cxx-pretty-print.c (pp_cxx_exception_specification): Likewise.
* ptree.c (cxx_print_xnode): Likewise.
* tree.c (cp_tree_equal): Likewise.
* decl.c (cp_tree_node_structure): Likewise.
(duplicate_decls): Call maybe_instantiate_noexcept.
* except.c (build_noexcept_spec): Handle DEFERRED_NOEXCEPT.
(nothrow_spec_p, type_noexcept_p, type_throw_all_p): Check
DEFERRED_NOEXCEPT_SPEC_P.
* typeck2.c (merge_exception_specifiers): Likewise.
* decl2.c (mark_used): Call maybe_instantiate_noexcept.
* method.c (process_subob_fn, defaulted_late_check): Likewise.
* pt.c (tsubst_exception_specification): Add defer_ok parm.
Build DEFERRED_NOEXCEPT.
(maybe_instantiate_noexcept): New.
(tsubst, regenerate_decl_from_template, instantiate_decl): Adjust.
* search.c (check_final_overrider): Call maybe_instantiate_noexcept.
From-SVN: r174820
Diffstat (limited to 'gcc/cp/except.c')
| -rw-r--r-- | gcc/cp/except.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/cp/except.c b/gcc/cp/except.c index 874f111..3399652 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -1160,6 +1160,7 @@ finish_noexcept_expr (tree expr, tsubst_flags_t complain) bool nothrow_spec_p (const_tree spec) { + gcc_assert (!DEFERRED_NOEXCEPT_SPEC_P (spec)); if (spec == NULL_TREE || TREE_VALUE (spec) != NULL_TREE || spec == noexcept_false_spec) @@ -1180,6 +1181,7 @@ bool type_noexcept_p (const_tree type) { tree spec = TYPE_RAISES_EXCEPTIONS (type); + gcc_assert (!DEFERRED_NOEXCEPT_SPEC_P (spec)); if (flag_nothrow_opt) return nothrow_spec_p (spec); else @@ -1193,6 +1195,7 @@ bool type_throw_all_p (const_tree type) { tree spec = TYPE_RAISES_EXCEPTIONS (type); + gcc_assert (!DEFERRED_NOEXCEPT_SPEC_P (spec)); return spec == NULL_TREE || spec == noexcept_false_spec; } @@ -1204,7 +1207,7 @@ build_noexcept_spec (tree expr, int complain) { /* This isn't part of the signature, so don't bother trying to evaluate it until instantiation. */ - if (!processing_template_decl) + if (!processing_template_decl && TREE_CODE (expr) != DEFERRED_NOEXCEPT) { expr = perform_implicit_conversion_flags (boolean_type_node, expr, complain, @@ -1219,7 +1222,8 @@ build_noexcept_spec (tree expr, int complain) return error_mark_node; else { - gcc_assert (processing_template_decl || expr == error_mark_node); + gcc_assert (processing_template_decl || expr == error_mark_node + || TREE_CODE (expr) == DEFERRED_NOEXCEPT); return build_tree_list (expr, NULL_TREE); } } |