review changes

Author: NinaRanns

gcc/cp/search.cc

@@ -2196,8 +2196,8 @@ check_final_overrider (tree overrider, tree basefn)
 	set_decl_contracts( overrider,
 			    remap_contracts (overrider,
 					     basefn,
-					     /* don't remap result */ false,
-					     /* remap post conditions */ true));
+					     /*remap_result*/ false,
+					     /*remap_post*/ true));
       }
     else if (DECL_HAS_CONTRACTS_P (basefn) && DECL_HAS_CONTRACTS_P (overrider))
       {

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

@@ -2,36 +2,44 @@
 // { dg-options "-std=c++2a -fcontracts -fcontract-continuation-mode=off -fcontracts-nonattr -fcontracts-nonattr-inheritance-mode=P3653 " }
 #include <cassert>
 
-struct contract{
+struct contract
+{
   int checked = 0;
 };
 
+contract a, b, c;
 
-contract a,b,c;
-
-bool checkA(){
-    a.checked++;
-    return true;
+bool
+checkA ()
+{
+  a.checked++;
+  return true;
 }
 
-bool checkB(){
-    b.checked++;
-    return true;
+bool
+checkB ()
+{
+  b.checked++;
+  return true;
 }
 
-bool checkC(){
-    c.checked++;
-    return true;
+bool
+checkC ()
+{
+  c.checked++;
+  return true;
 }
 
-void clear_checks(){
+void
+clear_checks ()
+{
   a.checked = b.checked = c.checked = 0;
 
 }
 
 struct Base
 {
-  virtual void f() pre (checkA()){};
+  virtual void f() pre (checkA ()){};
 };
 
 
@@ -42,12 +50,12 @@ struct Child0 : virtual Base
 
 struct Child1 : virtual Base
 {
-  virtual void f() pre (checkB()){};
+  virtual void f() pre (checkB ()){};
 };
 
 struct Child2 : virtual Base
 {
-  virtual void f() pre (checkC()){};
+  virtual void f() pre (checkC ()){};
 };
 
 
@@ -59,7 +67,7 @@ struct GChild0 : Child0
 
 struct GChild1 : Child0, Child1
 {
-  virtual void f() pre (checkC()){};
+  virtual void f() pre (checkC ()){};
 };
 
 struct GChild2 : Child0, Child1
@@ -90,84 +98,80 @@ int main(int, char**)
   GChild2 g2;
   GChild3 g3;
 
-  clear_checks();
-  fooBase(&b0);
-  assert(a.checked > 0);
-
-  clear_checks();
-  fooBase(&c0);
-  assert(a.checked > 0);
-
-  clear_checks();
-  fooBase(&c1);
-  assert(a.checked == 0);
-  assert(b.checked > 0);
-
-  clear_checks();
-  fooBase(&g0);
-  assert(a.checked > 0);
-  assert(b.checked == 0);
-  assert(c.checked == 0);
-
-  clear_checks();
-  fooBase(&g1);
-  assert(a.checked == 0);
-  assert(b.checked == 0);
-  assert(c.checked > 0);
-
-
-  clear_checks();
-  fooBase(&g2);
-  assert(a.checked > 0);
-  assert(b.checked > 0);
-  assert(c.checked == 0);
-
-
-  clear_checks();
-  fooBase(&g3);
-  assert(a.checked == 0);
-  assert(b.checked > 0);
-  assert(c.checked > 0);
-
-  clear_checks();
-  b0.f();
-  assert(a.checked > 0);
-
-  clear_checks();
-  c0.f();
-  assert(a.checked > 0);
-
-  clear_checks();
-  c1.f();
-  assert(a.checked == 0);
-  assert(b.checked > 0);
-
-  clear_checks();
-  g0.f();;
-  assert(a.checked > 0);
-  assert(b.checked == 0);
-  assert(c.checked == 0);
-
-
-  clear_checks();
-  g1.f();
-  assert(a.checked == 0);
-  assert(b.checked == 0);
-  assert(c.checked > 0);
-
-
-  clear_checks();
-  g2.f();
-  assert(a.checked > 0);
-  assert(b.checked > 0);
-  assert(c.checked == 0);
-
-  clear_checks();
-  g3.f();
-  assert(a.checked == 0);
-  assert(b.checked > 0);
-  assert(c.checked > 0);
-
+  clear_checks ();
+  fooBase (&b0);
+  assert (a.checked > 0);
+
+  clear_checks ();
+  fooBase (&c0);
+  assert (a.checked > 0);
+
+  clear_checks ();
+  fooBase (&c1);
+  assert (a.checked == 0);
+  assert (b.checked > 0);
+
+  clear_checks ();
+  fooBase (&g0);
+  assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
+
+  clear_checks ();
+  fooBase (&g1);
+  assert (a.checked == 0);
+  assert (b.checked == 0);
+  assert (c.checked > 0);
+
+  clear_checks ();
+  fooBase (&g2);
+  assert (a.checked > 0);
+  assert (b.checked > 0);
+  assert (c.checked == 0);
+
+  clear_checks ();
+  fooBase (&g3);
+  assert (a.checked == 0);
+  assert (b.checked > 0);
+  assert (c.checked > 0);
+
+  clear_checks ();
+  b0.f ();
+  assert (a.checked > 0);
+
+  clear_checks ();
+  c0.f ();
+  assert (a.checked > 0);
+
+  clear_checks ();
+  c1.f ();
+  assert (a.checked == 0);
+  assert (b.checked > 0);
+
+  clear_checks ();
+  g0.f ();
+  ;
+  assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
+
+  clear_checks ();
+  g1.f ();
+  assert (a.checked == 0);
+  assert (b.checked == 0);
+  assert (c.checked > 0);
+
+  clear_checks ();
+  g2.f ();
+  assert (a.checked > 0);
+  assert (b.checked > 0);
+  assert (c.checked == 0);
+
+  clear_checks ();
+  g3.f ();
+  assert (a.checked == 0);
+  assert (b.checked > 0);
+  assert (c.checked > 0);
 
   return 0;
 }