C++: remove points-to expectations for reused SSA

Robert Marsh · Robert Marsh · commit f9e0ba17e01b · 2021-05-06T08:14:37.000-07:00
diff --git a/cpp/ql/test/library-tests/ir/points_to/points_to.cpp b/cpp/ql/test/library-tests/ir/points_to/points_to.cpp
@@ -37,51 +37,51 @@ void Locals() {
 }
 
 void PointsTo(
-  int a,         //$raw,ussa=a
-  Point& b,      //$raw,ussa=b ussa=*b
-  Point* c,      //$raw,ussa=c ussa=*c
-  int* d,        //$raw,ussa=d ussa=*d
-  DerivedSI* e,  //$raw,ussa=e ussa=*e
-  DerivedMI* f,  //$raw,ussa=f ussa=*f
-  DerivedVI* g   //$raw,ussa=g ussa=*g
+  int a,         //$raw=a
+  Point& b,      //$raw=b ussa=*b
+  Point* c,      //$raw=c ussa=*c
+  int* d,        //$raw=d ussa=*d
+  DerivedSI* e,  //$raw=e ussa=*e
+  DerivedMI* f,  //$raw=f ussa=*f
+  DerivedVI* g   //$raw=g ussa=*g
 ) {
 
-  int i = a;  //$raw,ussa=a
-  i = *&a;  //$raw,ussa=a
-  i = *(&a + 0);  //$raw,ussa=a
-  i = b.x;  //$raw,ussa=b ussa=*b[0..4)<int>
-  i = b.y;  //$raw,ussa=b ussa=*b[4..8)<int>
-  i = c->x;  //$raw,ussa=c ussa=*c[0..4)<int>
-  i = c->y;  //$raw,ussa=c ussa=*c[4..8)<int>
-  i = *d;  //$raw,ussa=d ussa=*d[0..4)<int>
-  i = *(d + 0);  //$raw,ussa=d ussa=*d[0..4)<int>
-  i = d[5];  //$raw,ussa=d ussa=*d[20..24)<int>
-  i = 5[d];  //$raw,ussa=d ussa=*d[20..24)<int>
-  i = d[a];  //$raw,ussa=d raw,ussa=a ussa=*d[?..?)<int>
-  i = a[d];  //$raw,ussa=d raw,ussa=a ussa=*d[?..?)<int>
+  int i = a;  //$raw=a
+  i = *&a;  //$raw=a
+  i = *(&a + 0);  //$raw=a
+  i = b.x;  //$raw=b ussa=*b[0..4)<int>
+  i = b.y;  //$raw=b ussa=*b[4..8)<int>
+  i = c->x;  //$raw=c ussa=*c[0..4)<int>
+  i = c->y;  //$raw=c ussa=*c[4..8)<int>
+  i = *d;  //$raw=d ussa=*d[0..4)<int>
+  i = *(d + 0);  //$raw=d ussa=*d[0..4)<int>
+  i = d[5];  //$raw=d ussa=*d[20..24)<int>
+  i = 5[d];  //$raw=d ussa=*d[20..24)<int>
+  i = d[a];  //$raw=d raw=a ussa=*d[?..?)<int>
+  i = a[d];  //$raw=d raw=a ussa=*d[?..?)<int>
 
-  int* p = &b.x;  //$raw,ussa=b
+  int* p = &b.x;  //$raw=b
   i = *p;  //$ussa=*b[0..4)<int>
-  p = &b.y;  //$raw,ussa=b
+  p = &b.y;  //$raw=b
   i = *p;  //$ussa=*b[4..8)<int>
-  p = &c->x;  //$raw,ussa=c
+  p = &c->x;  //$raw=c
   i = *p;  //$ussa=*c[0..4)<int>
-  p = &c->y;  //$raw,ussa=c
+  p = &c->y;  //$raw=c
   i = *p;  //$ussa=*c[4..8)<int>
-  p = &d[5];  //$raw,ussa=d
+  p = &d[5];  //$raw=d
   i = *p;  //$ussa=*d[20..24)<int>
-  p = &d[a];  //$raw,ussa=d raw,ussa=a
+  p = &d[a];  //$raw=d raw=a
   i = *p;  //$ussa=*d[?..?)<int>
 
-  Point* q = &c[a];  //$raw,ussa=c raw,ussa=a
+  Point* q = &c[a];  //$raw=c raw=a
   i = q->x;  //$ussa=*c[?..?)<int>
   i = q->y;  //$ussa=*c[?..?)<int>
 
-  i = e->b1;  //$raw,ussa=e ussa=*e[0..4)<int>
-  i = e->dsi;  //$raw,ussa=e ussa=*e[4..8)<int>
-  i = f->b1;  //$raw,ussa=f ussa=*f[0..4)<int>
-  i = f->b2;  //$raw,ussa=f ussa=*f[4..8)<int>
-  i = f->dmi;  //$raw,ussa=f ussa=*f[8..12)<int>
-  i = g->b1;  //$raw,ussa=g ussa=*g[?..?)<int>
-  i = g->dvi;  //$raw,ussa=g ussa=*g[8..12)<int>
+  i = e->b1;  //$raw=e ussa=*e[0..4)<int>
+  i = e->dsi;  //$raw=e ussa=*e[4..8)<int>
+  i = f->b1;  //$raw=f ussa=*f[0..4)<int>
+  i = f->b2;  //$raw=f ussa=*f[4..8)<int>
+  i = f->dmi;  //$raw=f ussa=*f[8..12)<int>
+  i = g->b1;  //$raw=g ussa=*g[?..?)<int>
+  i = g->dvi;  //$raw=g ussa=*g[8..12)<int>
 }
