git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR c++/77369 - wrong noexcept handling in C++14 and below 

* tree.c (strip_typedefs): Canonicalize TYPE_RAISES_EXCEPTIONS.

From-SVN: r254022
This commit is contained in:
Jason Merrill 2017-10-23 15:06:37 -04:00 committed by Jason Merrill
parent 52c91d3aaf
commit 802561b2cc
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2017-10-23 Jason Merrill <jason@redhat.com>
PR c++/77369 - wrong noexcept handling in C++14 and below
* tree.c (strip_typedefs): Canonicalize TYPE_RAISES_EXCEPTIONS.
2017-10-20 Nathan Sidwell <nathan@acm.org>
* class.c (layout_class_type): Cleanup as-base creation, determine

11
gcc/cp/tree.c
View File

@ -1439,7 +1439,11 @@ strip_typedefs (tree t, bool *remove_attributes)
is_variant = true;
type = strip_typedefs (TREE_TYPE (t), remove_attributes);
changed = type != TREE_TYPE (t) || is_variant;
tree canon_spec = (flag_noexcept_type
? canonical_eh_spec (TYPE_RAISES_EXCEPTIONS (t))
: NULL_TREE);
changed = (type != TREE_TYPE (t) || is_variant
|| TYPE_RAISES_EXCEPTIONS (t) != canon_spec);
for (arg_node = TYPE_ARG_TYPES (t);
arg_node;
@ -1498,9 +1502,8 @@ strip_typedefs (tree t, bool *remove_attributes)
type_memfn_rqual (t));
}
if (TYPE_RAISES_EXCEPTIONS (t))
result = build_exception_variant (result,
TYPE_RAISES_EXCEPTIONS (t));
if (canon_spec)
result = build_exception_variant (result, canon_spec);
if (TYPE_HAS_LATE_RETURN_TYPE (t))
TYPE_HAS_LATE_RETURN_TYPE (result) = 1;
}

12
gcc/testsuite/g++.dg/cpp0x/noexcept31.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/77369
// { dg-do compile { target c++11 } }
template<typename F> int caller(F f) noexcept(noexcept(f())) { f(); return 0; }
void func1() noexcept { }
void func2() { throw 1; }
int instantiate_caller_with_func1 = caller(func1);
static_assert( !noexcept(caller(func2)), "" );

2
gcc/testsuite/g++.dg/cpp1z/noexcept-type13.C
View File

@ -5,7 +5,7 @@
void foo () throw () {} // { dg-bogus "mangled name" }
template <class T>
T bar (T x) { return x; } // { dg-warning "mangled name" "" { target c++14_down } }
T bar (T x) { return x; }
void baz () { // { dg-bogus "mangled name" }
return (bar (foo)) ();