[pushed] c++: small contracts fixes

Message ID 20221201034639.136411-1-jason@redhat.com
State Committed
Commit 4304e09a1617bcf1c87f5bc96017ae5017379d75
Headers
Series [pushed] c++: small contracts fixes |

Commit Message

Jason Merrill Dec. 1, 2022, 3:46 a.m. UTC
  Tested x86_64-pc-linux-gnu, applying to trunk.

-- 8< --

The first is an actual bug: remove_contract_attributes was only keeping one
attribute.  The second just helps flow analysis in optimizers and static
analyzers.

gcc/cp/ChangeLog:

	* contracts.cc (remove_contract_attributes): Actually prepend
	to the list.
	* pt.cc (tsubst_contract): Only look for a postcondition if type is
	nonnull.
---
 gcc/cp/contracts.cc | 2 +-
 gcc/cp/pt.cc        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


base-commit: cda29c540037fbcf00a377196050953aab1d3d5b
  

Patch

diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
index a9097016768..45f52b20392 100644
--- a/gcc/cp/contracts.cc
+++ b/gcc/cp/contracts.cc
@@ -869,7 +869,7 @@  remove_contract_attributes (tree fndecl)
   tree list = NULL_TREE;
   for (tree p = DECL_ATTRIBUTES (fndecl); p; p = TREE_CHAIN (p))
     if (!cxx_contract_attribute_p (p))
-      list = tree_cons (TREE_PURPOSE (p), TREE_VALUE (p), NULL_TREE);
+      list = tree_cons (TREE_PURPOSE (p), TREE_VALUE (p), list);
   DECL_ATTRIBUTES (fndecl) = nreverse (list);
 }
 
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 2d8e4fdd4b5..08de273a900 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -11561,7 +11561,7 @@  tsubst_contract (tree decl, tree t, tree args, tsubst_flags_t complain,
   tree r = copy_node (t);
 
   /* Rebuild the result variable.  */
-  if (POSTCONDITION_P (t) && POSTCONDITION_IDENTIFIER (t))
+  if (type && POSTCONDITION_P (t) && POSTCONDITION_IDENTIFIER (t))
     {
       tree oldvar = POSTCONDITION_IDENTIFIER (t);