Merge pull request gcc-mirror#94 from NinaRanns/non_odr_parm_in_post

fixing parameter constness check in postconditions

Author: villevoutilainen

gcc/cp/contracts.cc

@@ -2791,8 +2791,8 @@ maybe_reject_param_in_postcondition (tree decl, location_t location)
 {
   if (flag_contracts_nonattr
       && TREE_CODE (decl) == PARM_DECL
-      && should_constify_contract
       && processing_postcondition
+      && !cp_unevaluated_operand
       && !(REFERENCE_REF_P (decl)
 	   && TREE_CODE (TREE_OPERAND (decl, 0)) == PARM_DECL)
 	   /* Return value parameter has DECL_ARTIFICIAL flag set. The flag

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

@@ -28,7 +28,7 @@ void f6(int i) pre mutable(i++);
 void f7(int &i) pre mutable(i++);
 void f8(int *i) pre mutable(i++);
 void f9(int *i) pre mutable(gi++);
-
+void f10(int i) post mutable(i > 5); // { dg-error "used in a postcondition must be const" }
 // todo structured binding test
 // lambda tests
 // template tests

gcc/testsuite/g++.dg/contracts/cpp26/postcondition-const-check.C

@@ -243,3 +243,67 @@ namespace nonFirstDeclarationNegative
   void PostCondT<T>::f (U i){}
 
 }
+
+namespace checkNonOdr{
+
+int f (int i, int *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+
+template <class T>
+int f (T i, T *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+struct PostCond {
+
+  PostCond (int i, int *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+
+  template <class T>
+  PostCond  (T i, T *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+  int f (int i, int *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+  template <class T>
+  int f (T i, T *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+};
+
+template <typename T>
+struct PostCondT
+{
+
+  PostCondT (int i, int *j)
+   post ( sizeof(i) )
+   post ( noexcept(check (&j)));
+
+  template <class U>
+  PostCondT (U i, U *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+  int f (int i, int *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+  int f (T i, T *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+
+  template <class U>
+  int f (U i, U *j)
+  post ( sizeof(i) )
+  post ( noexcept(check (&j)));
+};
+
+
+}