Merge in trunk.

[thirdparty/gcc.git] / gcc / cp / class.c

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 67413761d8c8cd18bbfd905bc466c8a1514966ee..c96d79dbc82a84df601c386724e6e79b04bd216e 100644 (file)
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4726,11 +4726,7 @@ deduce_noexcept_on_destructor (tree dtor)
 {
   if (!TYPE_RAISES_EXCEPTIONS (TREE_TYPE (dtor)))
     {
-      tree ctx = DECL_CONTEXT (dtor);
-      tree implicit_fn = implicitly_declare_fn (sfk_destructor, ctx,
-                                               /*const_p=*/false,
-                                               NULL, NULL);
-      tree eh_spec = TYPE_RAISES_EXCEPTIONS (TREE_TYPE (implicit_fn));
+      tree eh_spec = unevaluated_noexcept_spec ();
       TREE_TYPE (dtor) = build_exception_variant (TREE_TYPE (dtor), eh_spec);
     }
 }