renaming the flag, fixing the artificial parameters in remapping

Author: NinaRanns

gcc/c-family/c.opt

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

gcc/cp/contracts.cc

@@ -1080,12 +1080,14 @@ remap_contract (tree src, tree dst, tree contract, bool duplicate_p)
   bool do_remap = false;
 
   /* Insert parameter remappings.  */
-  if (TREE_CODE (src) == FUNCTION_DECL)
-    src = DECL_ARGUMENTS (src);
-  if (TREE_CODE (dst) == FUNCTION_DECL)
-    dst = DECL_ARGUMENTS (dst);
+  gcc_assert(TREE_CODE (src) == FUNCTION_DECL);
+  gcc_assert(TREE_CODE (dst) == FUNCTION_DECL);
 
-  for (tree sp = src, dp = dst;
+  int src_num_artificial_args = num_artificial_parms_for (src);
+  int dst_num_artificial_args = num_artificial_parms_for (dst);
+
+
+  for (tree sp = DECL_ARGUMENTS (src), dp = DECL_ARGUMENTS (dst);
        sp || dp;
        sp = DECL_CHAIN (sp), dp = DECL_CHAIN (dp))
     {
@@ -1109,6 +1111,20 @@ remap_contract (tree src, tree dst, tree contract, bool duplicate_p)
 
       insert_decl_map (&id, sp, dp);
       do_remap = true;
+
+      /* First artificial arg is *this. We want to remap that. However, we
+	 want to skip _in_charge param and __vtt_parm. Do so now.  */
+      if (src_num_artificial_args > 0)
+	{
+	  while (--src_num_artificial_args,src_num_artificial_args > 0)
+	    sp = DECL_CHAIN (sp);
+	}
+      if (dst_num_artificial_args > 0)
+	{
+	  while (--dst_num_artificial_args,dst_num_artificial_args > 0)
+	    dp = DECL_CHAIN (dp);
+	}
+
     }
   if (!do_remap)
     return;

gcc/cp/contracts.h

@@ -61,7 +61,7 @@ enum contract_inheritance
 {
   CONTRACT_INHERITANCE_NONE = 0,
   CONTRACT_INHERITANCE_P2900R13 = 1,
-  CONTRACT_INHERITANCE_VILLE = 2,
+  CONTRACT_INHERITANCE_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_VILLE )
+      || flag_contract_nonattr_inheritance_mode != CONTRACT_INHERITANCE_P3653 )
     return;
 
   /* A constructor for a class T does not override a function T