C++: accept field flow test changes after merge

Robert Marsh · Robert Marsh · commit 53a87fa37835 · 2020-06-05T15:41:10.000-07:00
diff --git a/cpp/ql/test/library-tests/dataflow/fields/A.cpp b/cpp/ql/test/library-tests/dataflow/fields/A.cpp
@@ -53,8 +53,8 @@ class A
   {
     B *b = new B();
     b->set(new C1());
-    sink(b->get());                // $ast $f-:ir
-    sink((new B(new C()))->get()); // $ast $f-:ir
+    sink(b->get());                // $ast $ir=55:12
+    sink((new B(new C()))->get()); // $ast $ir
   }
 
   void f3()
diff --git a/cpp/ql/test/library-tests/dataflow/fields/C.cpp b/cpp/ql/test/library-tests/dataflow/fields/C.cpp
@@ -26,9 +26,9 @@ class C
 
   void func()
   {
-    sink(s1); // $ast $f-:ir
+    sink(s1); // $ast $ir
     sink(s2); // $f-:ast $f-:ir
-    sink(s3); // $ast $f-:ir
+    sink(s3); // $ast $ir
     sink(s4); // $f-:ast $f-:ir
   }
 
diff --git a/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp b/cpp/ql/test/library-tests/dataflow/fields/by_reference.cpp
@@ -48,19 +48,19 @@ struct S {
 void test_setDirectly() {
   S s;
   s.setDirectly(user_input());
-  sink(s.getDirectly()); // $ast $f-:ir
+  sink(s.getDirectly()); // $ast $ir
 }
 
 void test_setIndirectly() {
   S s;
   s.setIndirectly(user_input());
-  sink(s.getIndirectly()); // $ast $f-:ir
+  sink(s.getIndirectly()); // $ast $ir
 }
 
 void test_setThroughNonMember() {
   S s;
   s.setThroughNonMember(user_input());
-  sink(s.getThroughNonMember()); // $ast $f-:ir
+  sink(s.getThroughNonMember()); // $ast $ir
 }
 
 void test_nonMemberSetA() {
diff --git a/cpp/ql/test/library-tests/dataflow/fields/complex.cpp b/cpp/ql/test/library-tests/dataflow/fields/complex.cpp
@@ -48,8 +48,8 @@ void bar(Outer &b)
   // in _some_ access path somewhere in the search. That makes the library conclude
   // that there could be flow to `b.inner.f.a_` even when the flow was actually to
   // `b.inner.f.b_`.
-  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $f-:ir
-  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $f-:ir
+  sink(b.inner.f.a()); // $ast=62:19 $f+:ast=63:19 $ast=64:19 $f+:ast=65:19 $ir=62:19 $ir=64:19
+  sink(b.inner.f.b()); // $f+:ast=62:19 $ast=63:19 $f+:ast=64:19 $ast=65:19 $ir=63:19 $ir=65:19
 }
 
 void foo()
diff --git a/cpp/ql/test/library-tests/dataflow/fields/constructors.cpp b/cpp/ql/test/library-tests/dataflow/fields/constructors.cpp
@@ -25,8 +25,8 @@ class Foo
 
 void bar(Foo &f)
 {
-    sink(f.a()); //$ast=34:11 $ast=36:11 $f-:ir
-    sink(f.b()); //$ast=35:14 $ast=36:25 $f-:ir
+    sink(f.a()); //$ast=34:11 $ast=36:11 $ir=34:11 $ir=36:11
+    sink(f.b()); //$ast=35:14 $ast=36:25 $ir=35:14 $ir=36:25
 }
 
 void foo()
diff --git a/cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected b/cpp/ql/test/library-tests/dataflow/fields/ir-flow.expected
@@ -0,0 +1 @@
+| file://:0:0:0:0 | (const void *)... | Unexpected result: ir= |
diff --git a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.expected
diff --git a/cpp/ql/test/library-tests/dataflow/fields/simple.cpp b/cpp/ql/test/library-tests/dataflow/fields/simple.cpp
@@ -25,8 +25,8 @@ class Foo
 
 void bar(Foo &f)
 {
-    sink(f.a()); //$ast=39:12 $ast=41:12 $f-:ir
-    sink(f.b()); //$ast=40:12 $ast=42:12 $f-:ir
+    sink(f.a()); //$ast=39:12 $ast=41:12 $ir=39:12 $ir=41:12
+    sink(f.b()); //$ast=40:12 $ast=42:12 $ir=40:12 $ir=42:12
 }
 
 void foo()

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ class A`
`53`	`53`	`{`
`54`	`54`	`B *b = new B();`
`55`	`55`	`b->set(new C1());`
`56`		`- sink(b->get()); // $ast $f-:ir`
`57`		`- sink((new B(new C()))->get()); // $ast $f-:ir`
	`56`	`+ sink(b->get()); // $ast $ir=55:12`
	`57`	`+ sink((new B(new C()))->get()); // $ast $ir`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`void f3()`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,9 @@ class C`
`26`	`26`
`27`	`27`	`void func()`
`28`	`28`	`{`
`29`		`- sink(s1); // $ast $f-:ir`
	`29`	`+ sink(s1); // $ast $ir`
`30`	`30`	`sink(s2); // $f-:ast $f-:ir`
`31`		`- sink(s3); // $ast $f-:ir`
	`31`	`+ sink(s3); // $ast $ir`
`32`	`32`	`sink(s4); // $f-:ast $f-:ir`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ class Foo`
`25`	`25`
`26`	`26`	`void bar(Foo &f)`
`27`	`27`	`{`
`28`		`- sink(f.a()); //$ast=34:11 $ast=36:11 $f-:ir`
`29`		`- sink(f.b()); //$ast=35:14 $ast=36:25 $f-:ir`
	`28`	`+ sink(f.a()); //$ast=34:11 $ast=36:11 $ir=34:11 $ir=36:11`
	`29`	`+ sink(f.b()); //$ast=35:14 $ast=36:25 $ir=35:14 $ir=36:25`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`void foo()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| file://:0:0:0:0 \| (const void *)... \| Unexpected result: ir= \|`