Merge pull request #2873 from geoffw0/fixasttest2

C++: Fix another test that should be working on the AST dataflow.

Author: Robert Marsh

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/GlobalValueNumbering.expected

@@ -0,0 +1,40 @@
+| test.cpp:5:3:5:3 | x | 5:c3-c3 6:c3-c3 |
+| test.cpp:5:7:5:8 | p0 | 5:c7-c8 6:c7-c8 |
+| test.cpp:5:7:5:13 | ... + ... | 5:c7-c13 6:c7-c13 7:c7-c7 |
+| test.cpp:5:12:5:13 | p1 | 5:c12-c13 6:c12-c13 |
+| test.cpp:16:3:16:3 | x | 16:c3-c3 17:c3-c3 |
+| test.cpp:16:7:16:8 | p0 | 16:c7-c8 17:c7-c8 |
+| test.cpp:16:7:16:13 | ... + ... | 16:c7-c13 17:c7-c13 |
+| test.cpp:16:7:16:24 | ... + ... | 16:c7-c24 17:c7-c24 18:c7-c7 |
+| test.cpp:16:12:16:13 | p1 | 16:c12-c13 17:c12-c13 |
+| test.cpp:16:17:16:24 | global01 | 16:c17-c24 17:c17-c24 |
+| test.cpp:29:7:29:8 | p0 | 29:c7-c8 31:c7-c8 |
+| test.cpp:29:7:29:13 | ... + ... | 29:c7-c13 31:c7-c13 |
+| test.cpp:29:12:29:13 | p1 | 29:c12-c13 31:c12-c13 |
+| test.cpp:31:7:31:24 | ... + ... | 31:c7-c24 32:c7-c7 |
+| test.cpp:43:7:43:8 | p0 | 43:c7-c8 45:c7-c8 |
+| test.cpp:43:7:43:13 | ... + ... | 43:c7-c13 45:c7-c13 |
+| test.cpp:43:12:43:13 | p1 | 43:c12-c13 45:c12-c13 |
+| test.cpp:44:9:44:9 | 0 | 44:c9-c9 51:c25-c25 53:c18-c21 56:c39-c42 59:c17-c20 88:c12-c12 |
+| test.cpp:45:7:45:24 | ... + ... | 45:c7-c24 46:c7-c7 |
+| test.cpp:53:10:53:13 | (int)... | 53:c10-c13 56:c21-c24 |
+| test.cpp:53:10:53:13 | * ... | 53:c10-c13 56:c21-c24 |
+| test.cpp:53:11:53:13 | str | 53:c11-c13 56:c22-c24 |
+| test.cpp:53:18:53:21 | 0 | 53:c18-c21 56:c39-c42 59:c17-c20 |
+| test.cpp:56:13:56:16 | (int)... | 56:c13-c16 56:c31-c34 59:c9-c12 |
+| test.cpp:56:13:56:16 | * ... | 56:c13-c16 56:c31-c34 59:c9-c12 |
+| test.cpp:56:14:56:16 | ptr | 56:c14-c16 56:c32-c34 56:c47-c49 59:c10-c12 |
+| test.cpp:62:5:62:10 | result | 62:c5-c10 65:c10-c15 |
+| test.cpp:77:20:77:30 | (signed short)... | 77:c20-c30 79:c7-c7 |
+| test.cpp:79:11:79:14 | vals | 79:c11-c14 79:c24-c27 |
+| test.cpp:105:11:105:12 | (Base *)... | 105:c11-c12 106:c14-c35 107:c11-c12 |
+| test.cpp:105:11:105:12 | pd | 105:c11-c12 106:c33-c34 |
+| test.cpp:105:15:105:15 | b | 105:c15-c15 107:c15-c15 109:c10-c10 |
+| test.cpp:125:11:125:12 | pa | 125:c11-c12 126:c11-c12 128:c3-c4 129:c11-c12 |
+| test.cpp:125:15:125:15 | x | 125:c15-c15 126:c15-c15 128:c7-c7 |
+| test.cpp:136:11:136:18 | global_a | 136:c11-c18 137:c11-c18 139:c3-c10 |
+| test.cpp:136:21:136:21 | x | 136:c21-c21 137:c21-c21 139:c13-c13 |
+| test.cpp:144:11:144:12 | pa | 144:c11-c12 145:c11-c12 147:c3-c4 149:c11-c12 |
+| test.cpp:145:15:145:15 | y | 145:c15-c15 147:c7-c7 |
+| test.cpp:153:11:153:18 | global_a | 153:c11-c18 154:c11-c18 156:c3-c10 |
+| test.cpp:153:21:153:21 | x | 153:c21-c21 154:c21-c21 |

cpp/ql/test/library-tests/valuenumbering/GlobalValueNumbering/ast_gvn.expected

@@ -1,5 +1,5 @@
 import cpp
-import semmle.code.cpp.valuenumbering.GlobalValueNumbering
+import semmle.code.cpp.valuenumbering.GlobalValueNumberingImpl
 
 from GVN g
 where strictcount(g.getAnExpr()) > 1