review comments

NinaRanns · Jan 22, 2025 · 8e8888c · 8e8888c
1 parent a07766f
commit 8e8888c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
@@ -1964,9 +1964,9 @@ fcontracts-nonattr-client-contracts=
 C++ Joined RejectNegative Enum(client_contract_check) Var(flag_contract_nonattr_client_check) Init (0)
 -fcontracts-nonattr-client-check=[none|pre|all] Select which contracts will be checked on the client side for non virtual functions
 
-fcontracts-nonattr-def-contracts=
-C++ Var(flag_contracts_nonattr_def_contracts) Enum(on_off) Joined Init(1) RejectNegative
--fcontracts-nonattr-def-contract=[on|off]	Enable or disable contract checks on the definition side for all functions (default on).
+fcontracts-nonattr-definition-check=
+C++ Joined RejectNegative Enum(on_off) Var(flag_contracts_nonattr_definition_check) Init(1)
+-fcontracts-nonattr-definition-check=[on|off]	Enable or disable contract checks on the definition side for all functions (default on).
 
 fcoroutines
 C++ LTO Var(flag_coroutines)

diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc
@@ -2774,7 +2774,7 @@ start_function_contracts (tree decl1)
 
   /* If this is not a client side check and definition side checks are
      disabled, do nothing.  */
-  if (!flag_contracts_nonattr_def_contracts &&
+  if (!flag_contracts_nonattr_definition_check &&
       !DECL_CONTRACT_WRAPPER(decl1))
     return;
 
@@ -2895,7 +2895,7 @@ maybe_apply_function_contracts (tree fndecl)
 
   /* If this is not a client side check and definition side checks are
      disabled, do nothing.  */
-  if (!flag_contracts_nonattr_def_contracts &&
+  if (!flag_contracts_nonattr_definition_check &&
       !DECL_CONTRACT_WRAPPER(fndecl))
     return;
 
@@ -3034,7 +3034,7 @@ finish_function_contracts (tree fndecl)
 
   /* If this is not a client side check and definition side checks are
      disabled, do nothing.  */
-  if (!flag_contracts_nonattr_def_contracts &&
+  if (!flag_contracts_nonattr_definition_check &&
       !DECL_CONTRACT_WRAPPER(fndecl))
     return;
 

diff --git a/gcc/testsuite/g++.dg/contracts/cpp26/definition-checks/virtual-func-no-def-check.C b/gcc/testsuite/g++.dg/contracts/cpp26/definition-checks/virtual-func-no-def-check.C
@@ -1,7 +1,7 @@
 // check that an invocation of a virtual function through the base class does not
 // check contracts of the derived function, which are definition side contracts
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-def-contracts=off " }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-definition-check=off " }
 
 struct Base
 {

diff --git a/gcc/testsuite/g++.dg/contracts/cpp26/definition-checks/virtual-func-no-def-check2.C b/gcc/testsuite/g++.dg/contracts/cpp26/definition-checks/virtual-func-no-def-check2.C
@@ -1,7 +1,7 @@
 // check that an invocation of a virtual function through the base class checks
 // the base class contracts when definition side contracts are turned off
 // { dg-do run }
-// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-def-contracts=off -fcontract-continuation-mode=on" }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-definition-check=off -fcontract-continuation-mode=on" }
 
 struct Base
 {