From: Jason Merrill <jason@redhat.com>
Date: Tue, 10 Mar 2020 21:31:33 +0000 (-0400)
Subject: c++: Fix deferred noexcept on constructor [PR93901].
X-Git-Tag: upstream/12.2.0~17916
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=481fcfe6fec156ca2a6baea4b623076e2eefa6a6;p=platform%2Fupstream%2Fgcc.git

c++: Fix deferred noexcept on constructor [PR93901].

My change in r10-4394 to only update clones when we actually instantiate a
deferred noexcept-spec broke this because deferred parsing updates the
primary function but not the clones.  For GCC 10, let's just revert it.

gcc/cp/ChangeLog
2020-03-10  Jason Merrill  <jason@redhat.com>

	PR c++/93901
	* pt.c (maybe_instantiate_noexcept): Always update clones.
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index b60b1ec..9e0b488 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2020-03-10  Jason Merrill  <jason@redhat.com>
 
+	PR c++/93901
+	* pt.c (maybe_instantiate_noexcept): Always update clones.
+
+2020-03-10  Jason Merrill  <jason@redhat.com>
+
 	PR c++/93956
 	* pt.c (maybe_aggr_guide): Check BRACE_ENCLOSED_INITIALIZER_P.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 179716b..cb237ba 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -25097,14 +25097,14 @@ maybe_instantiate_noexcept (tree fn, tsubst_flags_t complain)
       TREE_TYPE (fn) = build_exception_variant (fntype, spec);
       if (orig_fn)
 	TREE_TYPE (orig_fn) = TREE_TYPE (fn);
+    }
 
-      FOR_EACH_CLONE (clone, fn)
-	{
-	  if (TREE_TYPE (clone) == fntype)
-	    TREE_TYPE (clone) = TREE_TYPE (fn);
-	  else
-	    TREE_TYPE (clone) = build_exception_variant (TREE_TYPE (clone), spec);
-	}
+  FOR_EACH_CLONE (clone, fn)
+    {
+      if (TREE_TYPE (clone) == fntype)
+	TREE_TYPE (clone) = TREE_TYPE (fn);
+      else
+	TREE_TYPE (clone) = build_exception_variant (TREE_TYPE (clone), spec);
     }
 
   return true;