Merge pull request gcc-mirror#95 from NinaRanns/contracts_inheritance_ville_part2

fixing caller side checks

Author: villevoutilainen

gcc/c-family/c.opt

@@ -1980,9 +1980,9 @@ Enum(contract_inheritance) String(P2900R13) Value(1)
 EnumValue
 Enum(contract_inheritance) String(P3653) Value(2)
 
-fcontracts-nonattr-inheritance-mode=
-C++ Joined RejectNegative Enum(contract_inheritance) Var(flag_contract_nonattr_inheritance_mode) Init(0)
--fcontracts-nonattr-inheritance-mode=[none|P2900R13|P3653] Select how contracts are inherited for virtual functions
+fcontracts-on-virtual-functions=
+C++ Joined RejectNegative Enum(contract_inheritance) Var(flag_contracts_on_virtual_functions) Init(0)
+-fcontracts-on-virtual-functions=[none|P2900R13|P3653] Select how contracts are inherited for virtual functions
 
 Wsuggest-explicit-contract
 C++ ObjC++ Var(suggest_explicit_contract) Warning

gcc/cp/class.cc

@@ -3228,8 +3228,8 @@ check_for_override (tree decl, tree ctype)
 
       if (DECL_HAS_CONTRACTS_P(decl)
 	  && flag_contracts_nonattr
-	  && flag_contract_nonattr_inheritance_mode
-	      == CONTRACT_INHERITANCE_NONE)
+	  && flag_contracts_on_virtual_functions
+	      == CONTRACTS_ON_VIRTUALS_NONE)
 	{
 	  error_at (DECL_SOURCE_LOCATION(decl),
 		    "Contracts can not be added to virtual functions.");

gcc/cp/contracts.cc

@@ -3453,8 +3453,8 @@ should_contract_wrap_call (bool do_pre, bool do_post, bool is_virt)
   /* We always wrap virtual function calls, and non-virtual calls when
      client-side checking is enabled for all contracts.  */
   if ((is_virt
-       && (flag_contract_nonattr_inheritance_mode
-	   == CONTRACT_INHERITANCE_P2900R13))
+       && (flag_contracts_on_virtual_functions
+	   != CONTRACTS_ON_VIRTUALS_NONE))
       || (flag_contract_nonattr_client_check > 1))
     return true;
 
@@ -3533,8 +3533,8 @@ define_contract_wrapper_func (const tree& fndecl, const tree& wrapdecl, void*)
   bool check_post
     = (flag_contract_nonattr_client_check > 1)
       || (is_virtual
-	  && (flag_contract_nonattr_inheritance_mode
-	      == CONTRACT_INHERITANCE_P2900R13));
+	  && (flag_contracts_on_virtual_functions
+	      == CONTRACTS_ON_VIRTUALS_P2900R13));
   /* For wrappers on CDTORs we need to refer to the original contracts,
      when the wrapper is around a clone.  */
   set_decl_contracts( wrapdecl,

gcc/cp/contracts.h

@@ -59,9 +59,9 @@ enum contract_semantic
 
 enum contract_inheritance
 {
-  CONTRACT_INHERITANCE_NONE = 0,
-  CONTRACT_INHERITANCE_P2900R13 = 1,
-  CONTRACT_INHERITANCE_P3653 = 2,
+  CONTRACTS_ON_VIRTUALS_NONE = 0,
+  CONTRACTS_ON_VIRTUALS_P2900R13 = 1,
+  CONTRACTS_ON_VIRTUALS_P3653 = 2,
 };
 
 /* True if the contract is unchecked.  */

gcc/cp/search.cc

@@ -2230,7 +2230,7 @@ check_override_contracts (tree fndecl)
 {
 
   if (!flag_contracts || !flag_contracts_nonattr
-      || flag_contract_nonattr_inheritance_mode != CONTRACT_INHERITANCE_P3653)
+      || flag_contracts_on_virtual_functions != CONTRACTS_ON_VIRTUALS_P3653)
     return;
 
   /* A constructor for a class T does not override a function T

gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contract_specifier_seq.C

@@ -2,7 +2,7 @@
 // behaves as if the function exited via an exception.
 // This tests the behaviour of a pre condition on a destructor
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe -fcontracts-nonattr-inheritance-mode=P2900R13" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe -fcontracts-on-virtual-functions=P2900R13" }
 
 #include <experimental/contract>
 #include <exception>

gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-multiple-inheritance2.C

@@ -1,5 +1,5 @@
 // { dg-do compile }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-on-virtual-functions=P2900R13" }
 
 struct BaseA {
   virtual int fun(int n) pre ( n > 0 ) { return -n; }

gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-pre4.C

@@ -1,6 +1,6 @@
 // test that contracts on overriding functions are found correctly
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -fcontracts-on-virtual-functions=P2900R13" }
 
 struct Base
 {

gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-redecl.C

@@ -1,6 +1,6 @@
 // generic error tests for generalized contract redecls
 // { dg-do compile }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-on-virtual-functions=P2900R13" }
 
 
 struct Base

gcc/testsuite/g++.dg/contracts/cpp26/P2900R13-virtual-func/contracts-virtual.C

@@ -1,5 +1,5 @@
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P2900R13" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-on-virtual-functions=P2900R13" }
 
 bool y_f4_called = false;
 bool y2_f4_called = false;