C++: Fix indirection ambiguity in the test.

geoffw0 · geoffw0 · commit e3ce7c608bf7 · 2024-04-08T18:27:51.000+01:00
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql b/cpp/ql/test/library-tests/dataflow/models-as-data/taint.ql
@@ -10,7 +10,8 @@ module IRTest {
     predicate isSource(DataFlow::Node source) {
       source instanceof FlowSource
       or
-      source.asExpr().(FunctionCall).getTarget().getName() = ["source", "source2", "source3", "sourcePtr"]
+      source.asExpr().(FunctionCall).getTarget().getName() =
+        ["source", "source2", "source3", "sourcePtr"]
       or
       source.asIndirectExpr(1).(FunctionCall).getTarget().getName() = "sourceIndirect"
     }
@@ -20,7 +21,7 @@ module IRTest {
       or
       exists(FunctionCall call |
         call.getTarget().getName() = "sink" and
-        [sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()
+        sink.asExpr() = call.getAnArgument()
       )
     }
   }
diff --git a/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp b/cpp/ql/test/library-tests/dataflow/models-as-data/tests.cpp
@@ -44,14 +44,14 @@ void test_sources() {
 	sink(localMadSourceVoid()); // $ ir
 	sink(localMadSourceHasBody()); // $ ir
 
-	sink(sourceIndirect()); // $ SPURIOUS: ir
+	sink(sourceIndirect());
 	sink(*sourceIndirect()); // $ ir
 
 	int v = localMadSource();
 	int *v_indirect = &v;
 	int v_direct = *v_indirect;
 	sink(v); // $ ir
-	sink(v_indirect); // $ SPURIOUS: ir
+	sink(v_indirect);
 	sink(*v_indirect); // $ ir
 	sink(v_direct); // $ ir
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ module IRTest {`
`10`	`10`	`predicate isSource(DataFlow::Node source) {`
`11`	`11`	`source instanceof FlowSource`
`12`	`12`	`or`
`13`		`- source.asExpr().(FunctionCall).getTarget().getName() = ["source", "source2", "source3", "sourcePtr"]`
	`13`	`+ source.asExpr().(FunctionCall).getTarget().getName() =`
	`14`	`+ ["source", "source2", "source3", "sourcePtr"]`
`14`	`15`	`or`
`15`	`16`	`source.asIndirectExpr(1).(FunctionCall).getTarget().getName() = "sourceIndirect"`
`16`	`17`	`}`
`@@ -20,7 +21,7 @@ module IRTest {`
`20`	`21`	`or`
`21`	`22`	`exists(FunctionCall call \|`
`22`	`23`	`call.getTarget().getName() = "sink" and`
`23`		`- [sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()`
	`24`	`+ sink.asExpr() = call.getAnArgument()`
`24`	`25`	`)`
`25`	`26`	`}`
`26`	`27`	`}`