C++: Update test expectations due to better dataflow analysis

Author: dave-bartolomeo

cpp/ql/test/library-tests/dataflow/dataflow-tests/test.cpp

@@ -140,17 +140,17 @@ void following_pointers(
   sink(sourceStruct1.m1); // flow (due to lack of no-alias tracking)
 
   twoIntFields s = { source(), source() };
-  // TODO: fix this by distinguishing between an AggregateLiteral that
-  // initializes an array and one that initializes a struct.
-  sink(s.m2); // no flow (due to limitations of the analysis)
+
+
+  sink(s.m2); // flow (AST dataflow misses this due to limitations of the analysis)
 
   twoIntFields sArray[1] = { { source(), source() } };
   // TODO: fix this like above
   sink(sArray[0].m2); // no flow (due to limitations of the analysis)
 
   twoIntFields sSwapped = { .m2 = source(), .m1 = 0 };
-  // TODO: fix this like above
-  sink(sSwapped.m2); // no flow (due to limitations of the analysis)
+
+  sink(sSwapped.m2); // flow (AST dataflow misses this due to limitations of the analysis)
 
   sink(sourceFunctionPointer()); // no flow
 

cpp/ql/test/library-tests/dataflow/dataflow-tests/test_diff.expected

@@ -1,11 +1,12 @@
 | test.cpp:89:28:89:34 | test.cpp:92:8:92:14 | IR only |
 | test.cpp:100:13:100:18 | test.cpp:103:10:103:12 | AST only |
 | test.cpp:109:9:109:14 | test.cpp:110:10:110:12 | IR only |
-| test.cpp:120:9:120:20 | test.cpp:126:8:126:19 | AST only |
 | test.cpp:122:18:122:30 | test.cpp:132:22:132:23 | IR only |
 | test.cpp:122:18:122:30 | test.cpp:140:22:140:23 | IR only |
 | test.cpp:136:27:136:32 | test.cpp:137:27:137:28 | AST only |
 | test.cpp:136:27:136:32 | test.cpp:140:22:140:23 | AST only |
+| test.cpp:142:32:142:37 | test.cpp:145:10:145:11 | IR only |
+| test.cpp:151:35:151:40 | test.cpp:153:17:153:18 | IR only |
 | test.cpp:395:17:395:22 | test.cpp:397:10:397:18 | AST only |
 | test.cpp:421:13:421:18 | test.cpp:423:10:423:14 | AST only |
 | test.cpp:430:48:430:54 | test.cpp:433:8:433:10 | AST only |

cpp/ql/test/library-tests/dataflow/dataflow-tests/test_ir.expected

@@ -15,8 +15,12 @@
 | test.cpp:90:8:90:14 | Load: source1 | test.cpp:89:28:89:34 | InitializeParameter: source1 |
 | test.cpp:92:8:92:14 | Load: source1 | test.cpp:89:28:89:34 | InitializeParameter: source1 |
 | test.cpp:110:10:110:12 | Load: (reference dereference) | test.cpp:109:9:109:14 | Call: call to source |
+| test.cpp:126:8:126:19 | Convert: (const int *)... | test.cpp:120:9:120:20 | InitializeParameter: sourceArray1 |
+| test.cpp:126:8:126:19 | Load: sourceArray1 | test.cpp:120:9:120:20 | InitializeParameter: sourceArray1 |
 | test.cpp:132:22:132:23 | Load: m1 | test.cpp:122:18:122:30 | InitializeParameter: sourceStruct1 |
 | test.cpp:140:22:140:23 | Load: m1 | test.cpp:122:18:122:30 | InitializeParameter: sourceStruct1 |
+| test.cpp:145:10:145:11 | Load: m2 | test.cpp:142:32:142:37 | Call: call to source |
+| test.cpp:153:17:153:18 | Load: m2 | test.cpp:151:35:151:40 | Call: call to source |
 | test.cpp:188:8:188:8 | Load: y | test.cpp:186:27:186:32 | Call: call to source |
 | test.cpp:192:8:192:8 | Load: s | test.cpp:199:33:199:38 | Call: call to source |
 | test.cpp:200:8:200:8 | Load: y | test.cpp:199:33:199:38 | Call: call to source |