Merge pull request #47 from NinaRanns/contract_wrapper_thunk_fix

thunk thinko

Author: villevoutilainen

gcc/cp/contracts.cc

@@ -3191,7 +3191,6 @@ maybe_contract_wrap_call (tree fndecl, tree call)
 
   tree wrapcall = build_call_expr_loc_vec(DECL_SOURCE_LOCATION (wrapdecl), wrapdecl, argwrap);
 
-  CALL_FROM_THUNK_P (wrapcall) = true;
   return wrapcall;
 }
 
@@ -3233,6 +3232,9 @@ bool define_contract_wrapper_func(const tree& fndecl, const tree& wrapdecl, void
 			    args->length (),
 			    args->address ());
 
+
+  CALL_FROM_THUNK_P (call) = true;
+
   finish_return_stmt (call);
 
   finish_compound_stmt (compound_stmt);

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

@@ -0,0 +1,18 @@
+// { dg-do compile }
+// { dg-options "-std=c++2a -fcontracts -fcontracts-nonattr -fcontract-evaluation-semantic=observe -fcontracts-nonattr-client-contracts=all" }
+
+
+struct S{
+  S(){};
+  S(const S&){}
+  ~S(){};
+  int x = 0;
+};
+
+void f(S s) pre(s.x == 1 ) {};
+
+int main()
+{
+  S s;
+  f(s);
+}

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

@@ -0,0 +1,25 @@
+// Test that non trivial types work ok with a contract wrapper for virtual
+// functions.
+// { dg-do compile }
+// { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=on -fcontracts-nonattr -g3" }
+
+struct NonTrivial{
+  NonTrivial(){};
+  NonTrivial(const NonTrivial&){}
+  ~NonTrivial(){};
+  int x = 0;
+};
+
+struct S
+{
+
+  virtual void f(const NonTrivial s) post(s.x >1 ) {};
+
+};
+
+int main()
+{
+  NonTrivial nt;
+  S s;
+  s.f(nt);
+}