C++: The next commit is going to track flow out of both direct and indirect sources. This means we'll get a lot of duplication since there'll be flow from indirect source -> indirect sink and direct source -> direct sink (which both map to the same expressions). This commit changes the testing so that we only report a duplication when they're at different locations.

MathiasVP · MathiasVP · commit a806569b5feb · 2023-02-27T14:57:35.000Z
diff --git a/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll b/cpp/ql/test/TestUtilities/dataflow/FlowTestCommon.qll
@@ -25,7 +25,12 @@ class IRFlowTest extends InlineExpectationsTest {
     exists(IRDataFlow::Node source, IRDataFlow::Node sink, IRDataFlow::Configuration conf, int n |
       tag = "ir" and
       conf.hasFlow(source, sink) and
-      n = strictcount(IRDataFlow::Node otherSource | conf.hasFlow(otherSource, sink)) and
+      n =
+        strictcount(int line, int column |
+          conf.hasFlow(any(IRDataFlow::Node otherSource |
+              otherSource.hasLocationInfo(_, line, column, _, _)
+            ), sink)
+        ) and
       (
         n = 1 and value = ""
         or
@@ -53,7 +58,12 @@ class AstFlowTest extends InlineExpectationsTest {
     |
       tag = "ast" and
       conf.hasFlow(source, sink) and
-      n = strictcount(AstDataFlow::Node otherSource | conf.hasFlow(otherSource, sink)) and
+      n =
+        strictcount(int line, int column |
+          conf.hasFlow(any(AstDataFlow::Node otherSource |
+              otherSource.hasLocationInfo(_, line, column, _, _)
+            ), sink)
+        ) and
       (
         n = 1 and value = ""
         or
diff --git a/cpp/ql/test/library-tests/dataflow/fields/A.cpp b/cpp/ql/test/library-tests/dataflow/fields/A.cpp
@@ -40,7 +40,7 @@ class A
     cc.insert(nullptr);
     ct.insert(new C());
     sink(&cc); // no flow
-    sink(&ct); // $ ast ir=41:15
+    sink(&ct); // $ ast ir
   }
   void f1()
   {
@@ -53,7 +53,7 @@ class A
   {
     B *b = new B();
     b->set(new C1());
-    sink(b->get());                // $ ast ir=55:12
+    sink(b->get());                // $ ast ir
     sink((new B(new C()))->get()); // $ ast ir
   }
 
@@ -63,7 +63,7 @@ class A
     B *b2;
     b2 = setOnB(b1, new C2());
     sink(b1->c); // no flow
-    sink(b2->c); // $ ast ir=64:21
+    sink(b2->c); // $ ast ir
   }
 
   void f4()
@@ -72,7 +72,7 @@ class A
     B *b2;
     b2 = setOnBWrap(b1, new C2());
     sink(b1->c); // no flow
-    sink(b2->c); // $ ast ir=73:25
+    sink(b2->c); // $ ast ir
   }
 
   B *setOnBWrap(B *b1, C *c)
diff --git a/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/test.cpp b/cpp/ql/test/library-tests/dataflow/smart-pointers-taint/test.cpp
@@ -8,7 +8,7 @@ void test_unique_ptr_int() {
 	std::unique_ptr<int> p2 = std::make_unique<int>(source());
 	
 	sink(*p1); // $ ir MISSING: ast
-	sink(*p2); // $ ast ir=8:50
+	sink(*p2); // $ ast ir
 }
 
 struct A {
@@ -23,7 +23,7 @@ void test_unique_ptr_struct() {
 	
 	sink(p1->x); // $ ir MISSING: ast
 	sink(p1->y);
-	sink(p2->x); // $ ir=22:46 MISSING: ast
+	sink(p2->x); // $ ir MISSING: ast
 	sink(p2->y);
 }
 
@@ -32,7 +32,7 @@ void test_shared_ptr_int() {
 	std::shared_ptr<int> p2 = std::make_shared<int>(source());
 	
 	sink(*p1); // $ ast,ir
-	sink(*p2); // $ ast ir=32:50
+	sink(*p2); // $ ast ir
 }
 
 void test_shared_ptr_struct() {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class A`
`40`	`40`	`cc.insert(nullptr);`
`41`	`41`	`ct.insert(new C());`
`42`	`42`	`sink(&cc); // no flow`
`43`		`- sink(&ct); // $ ast ir=41:15`
	`43`	`+ sink(&ct); // $ ast ir`
`44`	`44`	`}`
`45`	`45`	`void f1()`
`46`	`46`	`{`
`@@ -53,7 +53,7 @@ class A`
`53`	`53`	`{`
`54`	`54`	`B *b = new B();`
`55`	`55`	`b->set(new C1());`
`56`		`- sink(b->get()); // $ ast ir=55:12`
	`56`	`+ sink(b->get()); // $ ast ir`
`57`	`57`	`sink((new B(new C()))->get()); // $ ast ir`
`58`	`58`	`}`
`59`	`59`
`@@ -63,7 +63,7 @@ class A`
`63`	`63`	`B *b2;`
`64`	`64`	`b2 = setOnB(b1, new C2());`
`65`	`65`	`sink(b1->c); // no flow`
`66`		`- sink(b2->c); // $ ast ir=64:21`
	`66`	`+ sink(b2->c); // $ ast ir`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`void f4()`
`@@ -72,7 +72,7 @@ class A`
`72`	`72`	`B *b2;`
`73`	`73`	`b2 = setOnBWrap(b1, new C2());`
`74`	`74`	`sink(b1->c); // no flow`
`75`		`- sink(b2->c); // $ ast ir=73:25`
	`75`	`+ sink(b2->c); // $ ast ir`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`B setOnBWrap(B b1, C *c)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ void test_unique_ptr_int() {`
`8`	`8`	`std::unique_ptr<int> p2 = std::make_unique<int>(source());`
`9`	`9`
`10`	`10`	`sink(*p1); // $ ir MISSING: ast`
`11`		`- sink(*p2); // $ ast ir=8:50`
	`11`	`+ sink(*p2); // $ ast ir`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`struct A {`
`@@ -23,7 +23,7 @@ void test_unique_ptr_struct() {`
`23`	`23`
`24`	`24`	`sink(p1->x); // $ ir MISSING: ast`
`25`	`25`	`sink(p1->y);`
`26`		`- sink(p2->x); // $ ir=22:46 MISSING: ast`
	`26`	`+ sink(p2->x); // $ ir MISSING: ast`
`27`	`27`	`sink(p2->y);`
`28`	`28`	`}`
`29`	`29`
`@@ -32,7 +32,7 @@ void test_shared_ptr_int() {`
`32`	`32`	`std::shared_ptr<int> p2 = std::make_shared<int>(source());`
`33`	`33`
`34`	`34`	`sink(*p1); // $ ast,ir`
`35`		`- sink(*p2); // $ ast ir=32:50`
	`35`	`+ sink(*p2); // $ ast ir`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`void test_shared_ptr_struct() {`