inherited in class

Author: NinaRanns

gcc/cp/class.cc

@@ -3232,7 +3232,7 @@ check_for_override (tree decl, tree ctype)
 	      == CONTRACTS_ON_VIRTUALS_NONE)
 	{
 	  error_at (DECL_SOURCE_LOCATION(decl),
-		    "Contracts can not be added to virtual functions.");
+		    "Contracts cannot be added to virtual functions.");
 	}
     }
   else if (DECL_FINAL_P (decl))

gcc/cp/contracts.cc

@@ -980,6 +980,20 @@ extract_contract_attributes (tree fndecl)
   return contracts;
 }
 
+/*
+ */
+
+/* Set contracts of FNDECL to be CONTRACTS.  */
+
+void
+set_contract_attributes (tree fndecl, tree contracts)
+{
+  remove_contract_attributes (fndecl);
+  tree attrs = chainon (DECL_ATTRIBUTES(fndecl), contracts);
+  DECL_ATTRIBUTES (fndecl) = attrs;
+}
+
+
 /* Copy contract attributes from NEWDECL onto the attribute list of
    OLDDECL.  */
 
@@ -3049,11 +3063,6 @@ maybe_apply_function_contracts (tree fndecl)
   /* We should not have reached here with nothing to do... */
   gcc_checking_assert (do_pre || do_post);
 
-  if (contract_any_deferred_p (DECL_CONTRACTS (fndecl)))
-    {
-      //debug_tree (DECL_CONTRACTS (fndecl));
-    }
-
   /* If the function is noexcept, the user's written body will be wrapped in a
      MUST_NOT_THROW expression.  In that case we want to extract the body from
      that and build the replacement (including the pre and post-conditions as
@@ -3126,16 +3135,18 @@ maybe_apply_function_contracts (tree fndecl)
    If remap_post is false, postconditions are dropped from the destination.  */
 
 tree
-remap_contracts (tree dest, tree source, bool remap_result = true,
-			  bool remap_post = true )
+copy_and_remap_contracts (tree dest, tree source, bool remap_result = true,
+			  contract_match_kind remap_kind = cmk_all )
 {
   tree last = NULL_TREE, contract_attrs = NULL_TREE;
   for (tree a = DECL_CONTRACTS (source);
       a != NULL_TREE;
       a = CONTRACT_CHAIN (a))
     {
-      if (!remap_post
-	  && (TREE_CODE (CONTRACT_STATEMENT (a)) == POSTCONDITION_STMT))
+      if ((remap_kind == cmk_pre
+	   && (TREE_CODE (CONTRACT_STATEMENT (a)) == POSTCONDITION_STMT))
+	  || (remap_kind == cmk_post
+	      && (TREE_CODE (CONTRACT_STATEMENT (a)) == PRECONDITION_STMT)))
 	continue;
 
       tree c = copy_node (a);
@@ -3535,18 +3546,19 @@ define_contract_wrapper_func (const tree& fndecl, const tree& wrapdecl, void*)
   bool is_virtual = DECL_IOBJ_MEMBER_FUNCTION_P (fndecl)
 		    && DECL_VIRTUAL_P (fndecl);
   /* We check postconditions on virtual function calls or if postcondition
-     checks are enabled for all clients.  We should not get here unless there
+     checks are enabled for clients.  We should not get here unless there
      are some checks to make.  */
   bool check_post
     = (flag_contract_nonattr_client_check > 1)
       || (is_virtual
 	  && (flag_contracts_on_virtual_functions
-	      == CONTRACTS_ON_VIRTUALS_P2900R13));
+	      != CONTRACTS_ON_VIRTUALS_NONE));
   /* For wrappers on CDTORs we need to refer to the original contracts,
      when the wrapper is around a clone.  */
   set_decl_contracts( wrapdecl,
-		      remap_contracts (wrapdecl, DECL_ORIGIN (fndecl),
-				       /*remap_result*/true, check_post));
+		      copy_and_remap_contracts (wrapdecl, DECL_ORIGIN (fndecl),
+				       /*remap_result*/true,
+				       check_post? cmk_all : cmk_pre));
 
   start_preparsed_function (wrapdecl, /*DECL_ATTRIBUTES*/NULL_TREE,
 			    SF_DEFAULT | SF_PRE_PARSED);

gcc/cp/contracts.h

@@ -218,6 +218,13 @@ enum contract_matching_context
   cmc_override
 };
 
+enum contract_match_kind
+{
+  cmk_all,
+  cmk_pre,
+  cmk_post
+};
+
 /* True if NODE is any kind of contract.  */
 #define CONTRACT_P(NODE)			\
   (TREE_CODE (NODE) == ASSERTION_STMT		\
@@ -349,7 +356,7 @@ extern tree finish_contract_attribute		(tree, tree);
 extern tree invalidate_contract			(tree);
 extern tree splice_out_contracts		(tree);
 extern bool all_attributes_are_contracts_p	(tree);
-extern tree remap_contracts  			(tree, tree, bool, bool);
+extern tree copy_and_remap_contracts		(tree, tree, bool, contract_match_kind);
 extern void start_function_contracts		(tree);
 extern void maybe_apply_function_contracts	(tree);
 extern void finish_function_contracts		(tree);

gcc/cp/cp-tree.h

@@ -9020,6 +9020,7 @@ extern void check_param_in_redecl 		(tree, tree);
 extern tree view_as_const                       (tree);
 extern tree maybe_contract_wrap_call	        (tree, tree);
 extern bool emit_contract_wrapper_func          (bool);
+extern void set_contract_attributes 		(tree, tree);
 
 /* Return the first contract in ATTRS, or NULL_TREE if there are none.  */
 
@@ -9074,6 +9075,22 @@ set_contract_const (tree t, bool constify)
   TREE_LANG_FLAG_4 (CONTRACT_CHECK (t)) = constify;
 }
 
+/* Returns whether the contract is inherited.  */
+
+inline bool
+get_contract_inherited (const_tree t)
+{
+  return TREE_LANG_FLAG_5 (CONTRACT_CHECK (t));
+}
+
+/* Mark the contract as inherited  */
+
+inline void
+set_contract_inherited (tree t, bool inherited)
+{
+  TREE_LANG_FLAG_5 (CONTRACT_CHECK (t)) = inherited;
+}
+
 /* Test if EXP is a contract const wrapper node.  */
 
 inline bool