[LValue Generalization] Update tests for validating member bounds (#455)

* Add dynamic bounds casts to prevent compile-time errors from checking member bounds * Add expected errors for checking member bounds
checkedc · Jun 10, 2021 · 251cf68 · 251cf68
1 parent 69b7f2b
commit 251cf68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tests/dynamic_checking/bounds/bounds-safe-interfaces.c b/tests/dynamic_checking/bounds/bounds-safe-interfaces.c
@@ -210,15 +210,15 @@ void write_driver(int failure_point, int *a1 : count(10),
       break;
     // Vary structure lengths.
     case 13:
-      s1->len = 0;
+      s1->len = 0, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       write_test(failure_point, a1, 10, a2, 10,  a3, 2, b1, 10, b2, 0, s1);
       break;
     case 14:
-      s1->len = 1;
+      s1->len = 1, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       write_test(failure_point, a1, 10, a2, 10, a3, 2, b1, 10, b2, 0, s1);
       break;
     case 15:
-      s1->len = 2;
+      s1->len = 2, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       write_test(failure_point, a1, 10, a2, 10,  a3, 2, b1, 10, b2, 0, s1);
       break;
     // Vary write position for a3 (7th parameter)
@@ -405,15 +405,15 @@ void read_driver(int failure_point, int *a1 : count(10),
       break;
     // Vary structure lengths.
     case 13:
-      s1->len = 0;
+      s1->len = 0, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       read_test(failure_point, a1, 10, a2, 10, a3, 2, b1, 10, b2, 0, s1);
       break;
     case 14:
-      s1->len = 1;
+      s1->len = 1, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       read_test(failure_point, a1, 10, a2, 10, a3, 2, b1, 10, b2, 0, s1);
       break;
     case 15:
-      s1->len = 2;
+      s1->len = 2, s1->f = _Dynamic_bounds_cast<_Array_ptr<int>>(s1->f, bounds(s1->f, s1->f + s1->len));
       read_test(failure_point, a1, 10, a2, 10, a3, 2, b1, 10, b2, 0, s1);
       break;
     // Vary read position for a3 (7th parameter)

diff --git a/tests/static_checking/bounds_decl_checking.c b/tests/static_checking/bounds_decl_checking.c
@@ -382,12 +382,12 @@ extern void check_exprs_nullterm(nt_array_ptr<int> arg1 : bounds(unknown),
   s.f1 = t2;
   s.f1 = t3;
 
-  s.f2 = t1;          // expected-error {{expression has unknown bounds}}
+  s.f2 = t1;          // expected-error {{inferred bounds for 's.f2' are unknown after assignment}}
   s.f2 = t2;
   s.f2 = t3;
 
-  s.f3 = t1;          // expected-error {{expression has unknown bounds}}
-  s.f3 = t2;          // expected-error {{declared bounds for s.f3 are invalid after assignment}}
+  s.f3 = t1;          // expected-error {{inferred bounds for 's.f3' are unknown after assignment}}
+  s.f3 = t2;          // expected-error {{declared bounds for 's.f3' are invalid after assignment}}
   s.f3 = t3;
 
   t1 = s.f1;