Merge pull request gcc-mirror#82 from iains/contracts-nonattr-wrapper-renames

Contracts nonattr wrapper renames

Author: villevoutilainen

gcc/cp/contracts.cc

@@ -1547,7 +1547,8 @@ build_contract_condition_function (tree fndecl, bool pre)
   DECL_NAME (fn) = copy_node (DECL_NAME (fn));
   DECL_INITIAL (fn) = NULL_TREE;
   CONTRACT_HELPER (fn) = pre ? ldf_contract_pre : ldf_contract_post;
-  DECL_CONTRACT_WRAPPER (fn) = false;
+  /* We might have a pre/post for a wrapper.  */
+  DECL_CONTRACT_WRAPPER (fn) = DECL_CONTRACT_WRAPPER (fndecl);
 
   IDENTIFIER_VIRTUAL_P (DECL_NAME (fn)) = false;
   DECL_VIRTUAL_P (fn) = false;
@@ -1844,6 +1845,17 @@ set_contract_wrapper_function (tree fndecl, tree wrapper)
   decl_wrapper_fn->put (fndecl, wrapper);
 }
 
+static tree
+contracts_fixup_cdtorname (tree idin)
+{
+  const char *n = IDENTIFIER_POINTER (idin);
+  size_t l = strlen (n);
+  char *nn = xasprintf ("%.*s_", (int)l-1, n);
+  tree nid = get_identifier (nn);
+  free (nn);
+  return nid;
+}
+
 /* Build a declaration for the contract wrapper of a caller FNDECL.
    If is_cvh is true, we're wrapping a contract violation handler
    in a noexcept wrapper. Otherwise, we're making a caller side
@@ -1862,16 +1874,10 @@ build_contract_wrapper_function (tree fndecl, bool is_cvh)
   tree fnname;
   if (is_cvh)
     fnname = get_identifier ("handle_contract_violation.noexcept_wrapper");
+  else if (DECL_NAME (fndecl) && IDENTIFIER_CDTOR_P (DECL_NAME (fndecl)))
+    fnname = contracts_fixup_cdtorname (DECL_NAME (fndecl));
   else
-    {
-      /* Use mangled name so we can differentiate between different virtual
-	 functions of the same name. */
-      const char *name = IDENTIFIER_POINTER ((mangle_decl_string (fndecl)));
-      char *buf = xasprintf ("%s.contract_wrapper", name);
-      fnname = get_identifier (buf);
-      free (buf);
-    }
-
+    fnname = copy_node (DECL_NAME (fndecl));
   location_t loc = DECL_SOURCE_LOCATION (fndecl);
 
   /* Handle the arg types list.  */
@@ -1898,19 +1904,20 @@ build_contract_wrapper_function (tree fndecl, bool is_cvh)
   if (flag_exceptions && (is_cvh || type_noexcept_p (TREE_TYPE (fndecl))))
     wrapper_type = build_exception_variant (wrapper_type, noexcept_true_spec);
 
-  /* This will create a member function if fndecl is a member function, so we
-     will need to adjust the type later.  */
   tree wrapdecl
     = build_lang_decl_loc (loc, FUNCTION_DECL, fnname, wrapper_type);
 
-  DECL_CONTEXT (wrapdecl) = NULL_TREE;
+  /* Put the wrapper in the same context as the callee.  */
+  DECL_CONTEXT (wrapdecl) = DECL_CONTEXT (fndecl);
+  if (!is_cvh)
+    /* This declaration is a contract wrapper function.  */
+    DECL_CONTRACT_WRAPPER (wrapdecl) = true;
+
   DECL_SOURCE_LOCATION (wrapdecl) = loc;
   /* The declaration was implicitly generated by the compiler.  */
   DECL_ARTIFICIAL (wrapdecl) = true;
   /* Declaration, no definition yet.  */
   DECL_INITIAL (wrapdecl) = NULL_TREE;
-  /* This declaration is a contract wrapper function.  */
-  DECL_CONTRACT_WRAPPER (wrapdecl) = true;
 
   /* Let the start function code fill in the result decl.  */
   DECL_RESULT (wrapdecl) = NULL_TREE; 
@@ -2351,7 +2358,6 @@ declare_noexcept_cvh_wrapper (tree fncvh_decl)
   if (!wrapdecl)
     {
       wrapdecl = build_contract_wrapper_function (fncvh_decl, /*is_cvh*/true);
-      wrapdecl = pushdecl_top_level (wrapdecl);
       set_contract_wrapper_function (fncvh_decl, wrapdecl);
     }
 
@@ -2842,9 +2848,13 @@ start_function_contracts (tree fndecl)
   /* If this is not a client side check and definition side checks are
      disabled, do nothing.  */
   if (!flag_contracts_nonattr_definition_check
-      && !DECL_CONTRACT_WRAPPER(fndecl))
+      && !DECL_CONTRACT_WRAPPER (fndecl))
     return;
 
+  /* Even if we will use an outlined function for the check (which will be the
+     same one we might use on the callee-side) we still need to check the re-
+     mapped contracts for shadowing.  */
+
   /* Check that the user did not try to shadow a function parameter with the
      specified postcondition result name.  */
   if (flag_contracts_nonattr)
@@ -3472,7 +3482,10 @@ define_contract_wrapper_func (const tree& fndecl, const tree& wrapdecl, void*)
      checks are enabled for all clients.  We should not get here unless there
      are some checks to make.  */
   bool check_post = (flag_contract_nonattr_client_check > 1) || is_virtual;
-  copy_and_remap_contracts (wrapdecl, fndecl, /*remap_result*/true, check_post);
+  /* For wrappers on CDTORs we need to refer to the original contracts,
+     when the wrapper is around a clone.  */
+  copy_and_remap_contracts (wrapdecl, DECL_ORIGIN (fndecl),
+			    /*remap_result*/true, check_post);
 
   start_preparsed_function (wrapdecl, /*DECL_ATTRIBUTES*/NULL_TREE,
 			    SF_DEFAULT | SF_PRE_PARSED);

gcc/cp/contracts.h

@@ -319,6 +319,10 @@ enum contract_matching_context
   (DECL_DECLARES_FUNCTION_P (NODE) && DECL_LANG_SPECIFIC (NODE) && \
    CONTRACT_HELPER (NODE) == ldf_contract_post)
 
+#define DECL_IS_WRAPPER_FN_P(NODE) \
+  (DECL_DECLARES_FUNCTION_P (NODE) && DECL_LANG_SPECIFIC (NODE) && \
+   DECL_CONTRACT_WRAPPER (NODE))
+
 extern void remove_contract_attributes		(tree);
 extern void copy_contract_attributes		(tree, tree);
 extern void remap_contracts			(tree, tree, tree, bool);

gcc/cp/mangle.cc

@@ -819,8 +819,10 @@ write_mangled_name (const tree decl, bool top_level)
       write_encoding (decl);
     }
 
-  /* If this is the pre/post function for a guarded function, append
-     .pre/post, like something from create_virtual_clone.  */
+  /* Identify helper functions for contracts support.  */
+  if (DECL_IS_WRAPPER_FN_P (decl))
+    write_string (JOIN_STR "contract_wrapper");
+
   if (DECL_IS_PRE_FN_P (decl))
     write_string (JOIN_STR "pre");
   else if (DECL_IS_POST_FN_P (decl))

gcc/testsuite/g++.dg/contracts/cpp26-attr/contracts-pre4.C

@@ -78,17 +78,17 @@ int main(int, char**)
   return 0;
 }
 
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:7: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Base: 13(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:7: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Child0: 13(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:23: a > 14.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Child1::f at .*.C:23: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child1::f at .*.C:23: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "Child1: 27(\n|\r\n|\r)" }
 // { dg-output "Child2: 31(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:45: a > 0.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Child3::f at .*.C:45: a > 0.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child3::f at .*.C:45: a > 0.*(\n|\r\n|\r)" }
 // { dg-output "Child3: 40(\n|\r\n|\r)" }
 // { dg-output "Child3: 41(\n|\r\n|\r)" }

gcc/testsuite/g++.dg/contracts/cpp26/callerside-checks/callerside-checks-all.C

@@ -34,19 +34,19 @@ int main(int, char**)
   return 0;
 }
 
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 2.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function f at .*: a > 2.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function f at .*: a > 2.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function f at .*: r > 2.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function f at .*: r > 2.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: r > 2.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 3.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function S::f at .*: a > 3.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function S::f at .*: a > 3.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function S::f at .*: r > 3.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: r > 3.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 4.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function S::f at .*: r > 3.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function TS<int>::f at .*: a > 4.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function TS<int>::f at .*: a > 4.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function TS<int>::f at .*: r > 4.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: r > 4.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function TS<int>::f at .*: r > 4.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function TS<int>::tf at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function TS<int>::tf<int> at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function TS<int>::tf<int> at .*: r > 5.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: r > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function TS<int>::tf at .*: r > 5.*(\n|\r\n|\r)" }

gcc/testsuite/g++.dg/contracts/cpp26/callerside-checks/ctor.C

@@ -0,0 +1,22 @@
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontracts-nonattr-client-check=pre" }
+
+struct X
+{
+    X (int x) noexcept
+     pre (x>1)
+    {
+      try {
+       int i = 1;
+      }
+      catch(...) {
+      }
+    }
+};
+
+int main()
+{
+  try {
+    X x(-42);
+  } catch (...) {
+  }
+}

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

@@ -78,17 +78,17 @@ int main(int, char**)
   return 0;
 }
 
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:7: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Base: 13(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:7: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*.C:7: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Child0: 13(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:23: a > 14.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Child1::f at .*.C:23: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child1::f at .*.C:23: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "Child1: 27(\n|\r\n|\r)" }
 // { dg-output "Child2: 31(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*.C:45: a > 0.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Child3::f at .*.C:45: a > 0.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child3::f at .*.C:45: a > 0.*(\n|\r\n|\r)" }
 // { dg-output "Child3: 40(\n|\r\n|\r)" }
 // { dg-output "Child3: 41(\n|\r\n|\r)" }

gcc/testsuite/g++.dg/contracts/cpp26/definition-checks/virtual-func-no-def-check2.C

@@ -27,5 +27,5 @@ int main(int, char**)
 
   return 0;
 }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 14.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: r > 2.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 14.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: r > 2.*(\n|\r\n|\r)" }

gcc/testsuite/g++.dg/contracts/cpp26/virtual_func1.C

@@ -68,33 +68,33 @@ int main(int, char**)
   return 0;
 }
 
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Base: 3(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "Child0: 3(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 14.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Child1::f at .*: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child1::f at .*: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "Child1: 17(\n|\r\n|\r)" }
 // { dg-output "contract violation in function GChild1::f at .*: a > 6.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 6.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function GChild1::f at .*: a > 6.*(\n|\r\n|\r)" }
 // { dg-output "GChild1: 103(\n|\r\n|\r)" }
 // { dg-output "contract violation in function GChild2::f at .*: a > 30.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 30.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function GChild2::f at .*: a > 30.*(\n|\r\n|\r)" }
 // { dg-output "GChild2: 207(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "fooBase.Base.: 1(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "fooBase.Child0.: 1(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child1::f at .*: a > 14.*(\n|\r\n|\r)" }
 // { dg-output "fooBase.Child1.: 11(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function GChild1::f at .*: a > 6.*(\n|\r\n|\r)" }
 // { dg-output "fooBase.GChild1.: 101(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function GChild2::f at .*: a > 30.*(\n|\r\n|\r)" }
 // { dg-output "fooBase.GChild2.: 201(\n|\r\n|\r)" }

gcc/testsuite/g++.dg/contracts/cpp26/virtual_func3.C

@@ -25,6 +25,6 @@ int main()
   foo(c);
 
 }
-// { dg-output "contract violation in function .*contract_wrapper at .*: a > 5.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base<int>::f at .*: a > 5.*(\n|\r\n|\r)" }
 // { dg-output "contract violation in function Child1<int>::f at .*: a > 3.*(\n|\r\n|\r)" }
-// { dg-output "contract violation in function .*contract_wrapper at .*: i > 4.*(\n|\r\n|\r)" }
+// { dg-output "contract violation in function Base<int>::f at .*: i > 4.*(\n|\r\n|\r)" }