diff options
| author | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-08-06 17:50:42 -0700 |
| commit | f1c18afafc2b321465ae6b07ede127095942d7dc (patch) | |
| tree | 812093eebfa8510367718c12c02f7da03c0e73bf /gcc-4.9/gcc/cp/except.c | |
| parent | 38a8aecfb882072900434499696b5c32a2274515 (diff) | |
| download | toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.gz toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.tar.bz2 toolchain_gcc-f1c18afafc2b321465ae6b07ede127095942d7dc.zip | |
[gcc-4.9] Merge svn r213650 from google/gcc-4_9 branch
Merge svn r213650 from google/gcc-4_9 branch. Tested with
arm,x86,mips,arm64,x86_64,mips64 build in liunux/windows.
Change-Id: I0c07f67d516074172aa393003eee664d01f2e0f2
Diffstat (limited to 'gcc-4.9/gcc/cp/except.c')
| -rw-r--r-- | gcc-4.9/gcc/cp/except.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/cp/except.c b/gcc-4.9/gcc/cp/except.c index 221971ac9..3a66c678b 100644 --- a/gcc-4.9/gcc/cp/except.c +++ b/gcc-4.9/gcc/cp/except.c @@ -1269,6 +1269,8 @@ bool nothrow_spec_p (const_tree spec) { gcc_assert (!DEFERRED_NOEXCEPT_SPEC_P (spec)); + if (spec == NULL_TREE && flag_default_noexcept) + return true; if (spec == NULL_TREE || TREE_VALUE (spec) != NULL_TREE || spec == noexcept_false_spec) @@ -1290,7 +1292,7 @@ type_noexcept_p (const_tree type) { tree spec = TYPE_RAISES_EXCEPTIONS (type); gcc_assert (!DEFERRED_NOEXCEPT_SPEC_P (spec)); - if (flag_nothrow_opt) + if (flag_nothrow_opt || flag_default_noexcept) return nothrow_spec_p (spec); else return spec == noexcept_true_spec; |