enabling virtual function wrappers for every virtual call model

Author: NinaRanns

gcc/cp/contracts.cc

@@ -3454,7 +3454,7 @@ should_contract_wrap_call (bool do_pre, bool do_post, bool is_virt)
      client-side checking is enabled for all contracts.  */
   if ((is_virt
        && (flag_contract_nonattr_inheritance_mode
-	   == CONTRACT_INHERITANCE_P2900R13))
+	   != CONTRACT_INHERITANCE_NONE))
       || (flag_contract_nonattr_client_check > 1))
     return true;
 

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

@@ -101,15 +101,20 @@ int main(int, char**)
   clear_checks ();
   fooBase (&b0);
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&c0);
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&c1);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked > 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&g0);
@@ -119,7 +124,7 @@ int main(int, char**)
 
   clear_checks ();
   fooBase (&g1);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked == 0);
   assert (c.checked > 0);
 
@@ -131,26 +136,30 @@ int main(int, char**)
 
   clear_checks ();
   fooBase (&g3);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked > 0);
   assert (c.checked > 0);
 
   clear_checks ();
   b0.f ();
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   c0.f ();
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   c1.f ();
   assert (a.checked == 0);
   assert (b.checked > 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   g0.f ();
-  ;
   assert (a.checked > 0);
   assert (b.checked == 0);
   assert (c.checked == 0);

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

@@ -88,15 +88,20 @@ main (int, char**)
   clear_checks ();
   fooBase (&b0);
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&c0);
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&c1);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked > 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   fooBase (&g0);
@@ -106,32 +111,36 @@ main (int, char**)
 
   clear_checks ();
   fooBase (&g1);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked == 0);
   assert (c.checked > 0);
 
   clear_checks ();
   fooBase (&g2);
-  assert (a.checked == 0);
+  assert (a.checked > 0);
   assert (b.checked > 0);
   assert (c.checked == 0);
 
   clear_checks ();
   b0.f ();
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   c0.f ();
   assert (a.checked > 0);
+  assert (b.checked == 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   c1.f ();
   assert (a.checked == 0);
   assert (b.checked > 0);
+  assert (c.checked == 0);
 
   clear_checks ();
   g0.f ();
-  ;
   assert (a.checked > 0);
   assert (b.checked == 0);
   assert (c.checked == 0);