diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2019-02-27 10:02:23 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2019-02-27 10:02:23 +0000 |
| commit | 65b309f7a50600adc8d0ae4dd8f62149875dc120 (patch) | |
| tree | b9f5e6de9b53bfd1b62b774be877aa9f9bb5c263 /gcc/cp/method.c | |
| parent | f86624d85f937e03110eb044e438d8316d860501 (diff) | |
| download | gcc-65b309f7a50600adc8d0ae4dd8f62149875dc120.zip gcc-65b309f7a50600adc8d0ae4dd8f62149875dc120.tar.gz gcc-65b309f7a50600adc8d0ae4dd8f62149875dc120.tar.bz2 | |
re PR c++/89488 (ICE in merge_exception_specifiers, at cp/typeck2.c:2395)
/cp
2019-02-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/89488
* method.c (process_subob_fn): When maybe_instantiate_noexcept
returns false don't call merge_exception_specifiers.
/testsuite
2019-02-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/89488
* g++.dg/cpp0x/nsdmi15.C: New.
/cp
2019-02-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/88987
* parser.c (cp_parser_noexcept_specification_opt): Return NULL_TREE
for a non-constant parsed expression.
/testsuite
2019-02-27 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/88987
* g++.dg/cpp0x/pr88987.C: New.
From-SVN: r269245
Diffstat (limited to 'gcc/cp/method.c')
| -rw-r--r-- | gcc/cp/method.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 6e0df68..477d3271 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1256,9 +1256,13 @@ process_subob_fn (tree fn, tree *spec_p, bool *trivial_p, if (spec_p) { - maybe_instantiate_noexcept (fn); - tree raises = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)); - *spec_p = merge_exception_specifiers (*spec_p, raises); + if (!maybe_instantiate_noexcept (fn)) + *spec_p = error_mark_node; + else + { + tree raises = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (fn)); + *spec_p = merge_exception_specifiers (*spec_p, raises); + } } if (!trivial_fn_p (fn) && !dtor_from_ctor) |