diff options
| author | Jason Merrill <jason@redhat.com> | 2011-04-07 17:48:00 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-04-07 17:48:00 -0400 |
| commit | d0bb79ac89f08dbc31be9d0427e9a16ea16fa37d (patch) | |
| tree | 6e0a430b978c2d506159a60291e15cc51b366f6c /gcc/cp | |
| parent | 6dab6cf121a173733b7d4a4519c8eb1c573fc7cb (diff) | |
| download | gcc-d0bb79ac89f08dbc31be9d0427e9a16ea16fa37d.zip gcc-d0bb79ac89f08dbc31be9d0427e9a16ea16fa37d.tar.gz gcc-d0bb79ac89f08dbc31be9d0427e9a16ea16fa37d.tar.bz2 | |
re PR c++/48468 ([C++0x][SFINAE] noexcept operator does not handle function templates well)
PR c++/48468
* except.c (build_noexcept_spec): Propagate error_mark_node.
(finish_noexcept_expr): Likewise.
From-SVN: r172148
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/except.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 04b9c40..d20cf51 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2011-04-07 Jason Merrill <jason@redhat.com> + PR c++/48468 + * except.c (build_noexcept_spec): Propagate error_mark_node. + (finish_noexcept_expr): Likewise. + PR c++/48452 * typeck.c (build_x_compound_expr_from_list): Return error_mark_node in SFINAE context. diff --git a/gcc/cp/except.c b/gcc/cp/except.c index a814d67..874f111 100644 --- a/gcc/cp/except.c +++ b/gcc/cp/except.c @@ -1125,6 +1125,9 @@ finish_noexcept_expr (tree expr, tsubst_flags_t complain) { tree fn; + if (expr == error_mark_node) + return error_mark_node; + if (processing_template_decl) return build_min (NOEXCEPT_EXPR, boolean_type_node, expr); @@ -1212,6 +1215,8 @@ build_noexcept_spec (tree expr, int complain) return noexcept_true_spec; else if (expr == boolean_false_node) return noexcept_false_spec; + else if (expr == error_mark_node) + return error_mark_node; else { gcc_assert (processing_template_decl || expr == error_mark_node); |