Merge branch 'master' into ir-this-parameter-2

Bring in fix for duplicate virtual variables for parameter indirections
2026-04-28 02:05:14 +02:00 · 2020-05-29 14:40:45 -07:00
parent f8cfcef9c9 91da0d5567
commit 5ee37bcd5a
79 changed files with 1470 additions and 1145 deletions
--- a/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/dataflow-consistency.expected
@@ -12,24 +12,6 @@ uniqueTypeRepr
 | complex.cpp:25:7:25:7 | constructor init of field inner [post-this] | Node should have one type representation but has 0. |
 | complex.cpp:25:7:25:7 | constructor init of field inner [pre-this] | Node should have one type representation but has 0. |
 uniqueNodeLocation
-| A.cpp:38:7:38:8 | call to C | Node should have one location but has 2. |
-| A.cpp:39:7:39:8 | call to C | Node should have one location but has 2. |
-| A.cpp:41:15:41:21 | call to C | Node should have one location but has 2. |
-| A.cpp:47:12:47:18 | call to C | Node should have one location but has 2. |
-| A.cpp:57:17:57:23 | call to C | Node should have one location but has 2. |
-| A.cpp:64:21:64:28 | call to C2 | Node should have one location but has 2. |
-| A.cpp:73:25:73:32 | call to C2 | Node should have one location but has 2. |
-| A.cpp:126:12:126:18 | call to C | Node should have one location but has 2. |
-| A.cpp:142:14:142:20 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C2 | Node should have one location but has 2. |
-| file://:0:0:0:0 | call to C2 | Node should have one location but has 2. |
 missingLocation
 uniqueNodeToString
 missingToString
--- a/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/dataflow-ir-consistency.expected
@@ -1,8 +1,5 @@
 uniqueEnclosingCallable
 uniqueTypeBound
-| by_reference.cpp:106:21:106:41 | Chi | Node should have one type bound but has 2. |
-| by_reference.cpp:126:21:126:40 | Chi | Node should have one type bound but has 2. |
-| file://:0:0:0:0 | Chi | Node should have one type bound but has 2. |
 uniqueTypeRepr
 uniqueNodeLocation
 | D.cpp:1:17:1:17 | o | Node should have one location but has 3. |
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-diff.expected
@@ -12,33 +12,41 @@
 | A.cpp:56:10:56:10 | b | AST only |
 | A.cpp:56:13:56:15 | call to get | AST only |
 | A.cpp:57:28:57:30 | call to get | AST only |
+| A.cpp:64:10:64:15 | this | AST only |
 | A.cpp:64:17:64:18 | b1 | AST only |
 | A.cpp:65:10:65:11 | b1 | AST only |
 | A.cpp:65:14:65:14 | c | AST only |
 | A.cpp:66:10:66:11 | b2 | AST only |
 | A.cpp:66:14:66:14 | c | AST only |
+| A.cpp:73:10:73:19 | this | AST only |
 | A.cpp:73:21:73:22 | b1 | AST only |
 | A.cpp:74:10:74:11 | b1 | AST only |
 | A.cpp:74:14:74:14 | c | AST only |
 | A.cpp:75:10:75:11 | b2 | AST only |
 | A.cpp:75:14:75:14 | c | AST only |
+| A.cpp:81:10:81:15 | this | AST only |
 | A.cpp:81:17:81:18 | b1 | AST only |
 | A.cpp:81:21:81:21 | c | AST only |
+| A.cpp:82:12:82:12 | this | AST only |
+| A.cpp:87:9:87:9 | this | AST only |
 | A.cpp:90:7:90:8 | b2 | AST only |
 | A.cpp:90:15:90:15 | c | AST only |
 | A.cpp:100:9:100:9 | a | AST only |
+| A.cpp:101:5:101:6 | this | AST only |
 | A.cpp:101:8:101:9 | c1 | AST only |
 | A.cpp:107:12:107:13 | c1 | AST only |
 | A.cpp:107:16:107:16 | a | AST only |
 | A.cpp:120:12:120:13 | c1 | AST only |
 | A.cpp:120:16:120:16 | a | AST only |
 | A.cpp:126:5:126:5 | b | AST only |
+| A.cpp:131:5:131:6 | this | AST only |
 | A.cpp:131:8:131:8 | b | AST only |
 | A.cpp:132:10:132:10 | b | AST only |
 | A.cpp:132:13:132:13 | c | AST only |
 | A.cpp:142:10:142:10 | c | AST only |
 | A.cpp:143:13:143:13 | b | AST only |
 | A.cpp:151:18:151:18 | b | AST only |
+| A.cpp:151:21:151:21 | this | AST only |
 | A.cpp:152:10:152:10 | d | AST only |
 | A.cpp:152:13:152:13 | b | AST only |
 | A.cpp:153:10:153:10 | d | AST only |
@@ -116,6 +124,7 @@
 | D.cpp:58:5:58:12 | this | AST only |
 | D.cpp:58:15:58:17 | box | AST only |
 | D.cpp:58:20:58:23 | elem | AST only |
+| D.cpp:59:5:59:7 | this | AST only |
 | D.cpp:64:10:64:17 | boxfield | AST only |
 | D.cpp:64:10:64:17 | this | AST only |
 | D.cpp:64:20:64:22 | box | AST only |
@@ -256,16 +265,6 @@
 | constructors.cpp:43:9:43:9 | g | AST only |
 | constructors.cpp:46:9:46:9 | h | AST only |
 | constructors.cpp:49:9:49:9 | i | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
-| file://:0:0:0:0 | this | AST only |
 | qualifiers.cpp:9:36:9:36 | a | AST only |
 | qualifiers.cpp:12:56:12:56 | a | AST only |
 | qualifiers.cpp:13:57:13:57 | a | AST only |
@@ -320,6 +319,7 @@
 | simple.cpp:65:7:65:7 | i | AST only |
 | simple.cpp:83:9:83:10 | this | AST only |
 | simple.cpp:83:12:83:13 | f1 | AST only |
+| simple.cpp:84:14:84:20 | this | AST only |
 | struct_init.c:15:8:15:9 | ab | AST only |
 | struct_init.c:15:12:15:12 | a | AST only |
 | struct_init.c:16:8:16:9 | ab | AST only |
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition-ir.expected
@@ -3,11 +3,17 @@
 | A.cpp:100:5:100:6 | c1 |
 | A.cpp:142:7:142:7 | b |
 | A.cpp:143:7:143:10 | this |
+| A.cpp:183:7:183:10 | this |
 | A.cpp:184:7:184:10 | this |
 | B.cpp:35:7:35:10 | this |
 | B.cpp:36:7:36:10 | this |
 | B.cpp:46:7:46:10 | this |
 | C.cpp:24:5:24:8 | this |
+| D.cpp:9:21:9:24 | this |
+| D.cpp:11:29:11:32 | this |
+| D.cpp:16:21:16:23 | this |
+| D.cpp:18:29:18:31 | this |
+| D.cpp:57:5:57:12 | this |
 | aliasing.cpp:9:3:9:3 | s |
 | aliasing.cpp:13:3:13:3 | s |
 | aliasing.cpp:17:3:17:3 | s |
@@ -24,20 +30,14 @@
 | by_reference.cpp:16:5:16:8 | this |
 | by_reference.cpp:84:3:84:7 | inner |
 | by_reference.cpp:88:3:88:7 | inner |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
+| complex.cpp:11:22:11:23 | this |
+| complex.cpp:12:22:12:23 | this |
+| constructors.cpp:20:24:20:25 | this |
+| constructors.cpp:21:24:21:25 | this |
 | qualifiers.cpp:9:30:9:33 | this |
 | qualifiers.cpp:12:49:12:53 | inner |
 | qualifiers.cpp:13:51:13:55 | inner |
+| simple.cpp:20:24:20:25 | this |
+| simple.cpp:21:24:21:25 | this |
 | simple.cpp:65:5:65:5 | a |
 | simple.cpp:83:9:83:10 | f2 |
--- a/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
+++ b/cpp/ql/test/library-tests/dataflow/fields/partial-definition.expected
@@ -14,28 +14,35 @@
 | A.cpp:56:10:56:10 | b |
 | A.cpp:56:13:56:15 | call to get |
 | A.cpp:57:28:57:30 | call to get |
+| A.cpp:64:10:64:15 | this |
 | A.cpp:64:17:64:18 | b1 |
 | A.cpp:65:10:65:11 | b1 |
 | A.cpp:65:14:65:14 | c |
 | A.cpp:66:10:66:11 | b2 |
 | A.cpp:66:14:66:14 | c |
+| A.cpp:73:10:73:19 | this |
 | A.cpp:73:21:73:22 | b1 |
 | A.cpp:74:10:74:11 | b1 |
 | A.cpp:74:14:74:14 | c |
 | A.cpp:75:10:75:11 | b2 |
 | A.cpp:75:14:75:14 | c |
+| A.cpp:81:10:81:15 | this |
 | A.cpp:81:17:81:18 | b1 |
 | A.cpp:81:21:81:21 | c |
+| A.cpp:82:12:82:12 | this |
+| A.cpp:87:9:87:9 | this |
 | A.cpp:90:7:90:8 | b2 |
 | A.cpp:90:15:90:15 | c |
 | A.cpp:100:5:100:6 | c1 |
 | A.cpp:100:9:100:9 | a |
+| A.cpp:101:5:101:6 | this |
 | A.cpp:101:8:101:9 | c1 |
 | A.cpp:107:12:107:13 | c1 |
 | A.cpp:107:16:107:16 | a |
 | A.cpp:120:12:120:13 | c1 |
 | A.cpp:120:16:120:16 | a |
 | A.cpp:126:5:126:5 | b |
+| A.cpp:131:5:131:6 | this |
 | A.cpp:131:8:131:8 | b |
 | A.cpp:132:10:132:10 | b |
 | A.cpp:132:13:132:13 | c |
@@ -44,6 +51,7 @@
 | A.cpp:143:7:143:10 | this |
 | A.cpp:143:13:143:13 | b |
 | A.cpp:151:18:151:18 | b |
+| A.cpp:151:21:151:21 | this |
 | A.cpp:152:10:152:10 | d |
 | A.cpp:152:13:152:13 | b |
 | A.cpp:153:10:153:10 | d |
@@ -71,6 +79,7 @@
 | A.cpp:169:12:169:12 | l |
 | A.cpp:169:15:169:18 | head |
 | A.cpp:183:7:183:10 | head |
+| A.cpp:183:7:183:10 | this |
 | A.cpp:184:7:184:10 | this |
 | A.cpp:184:13:184:16 | next |
 | B.cpp:7:25:7:25 | e |
@@ -99,9 +108,13 @@
 | C.cpp:24:5:24:8 | this |
 | C.cpp:24:11:24:12 | s3 |
 | D.cpp:9:21:9:24 | elem |
+| D.cpp:9:21:9:24 | this |
 | D.cpp:11:29:11:32 | elem |
+| D.cpp:11:29:11:32 | this |
 | D.cpp:16:21:16:23 | box |
+| D.cpp:16:21:16:23 | this |
 | D.cpp:18:29:18:31 | box |
+| D.cpp:18:29:18:31 | this |
 | D.cpp:22:10:22:11 | b2 |
 | D.cpp:22:14:22:20 | call to getBox1 |
 | D.cpp:22:25:22:31 | call to getElem |
@@ -122,10 +135,14 @@
 | D.cpp:51:27:51:27 | e |
 | D.cpp:52:14:52:14 | b |
 | D.cpp:57:5:57:12 | boxfield |
+| D.cpp:57:5:57:12 | this |
 | D.cpp:58:5:58:12 | boxfield |
+| D.cpp:58:5:58:12 | this |
 | D.cpp:58:15:58:17 | box |
 | D.cpp:58:20:58:23 | elem |
+| D.cpp:59:5:59:7 | this |
 | D.cpp:64:10:64:17 | boxfield |
+| D.cpp:64:10:64:17 | this |
 | D.cpp:64:20:64:22 | box |
 | D.cpp:64:25:64:28 | elem |
 | E.cpp:21:10:21:10 | p |
@@ -249,7 +266,9 @@
 | by_reference.cpp:136:8:136:13 | pouter |
 | by_reference.cpp:136:16:136:16 | a |
 | complex.cpp:11:22:11:23 | a_ |
+| complex.cpp:11:22:11:23 | this |
 | complex.cpp:12:22:12:23 | b_ |
+| complex.cpp:12:22:12:23 | this |
 | complex.cpp:51:8:51:8 | b |
 | complex.cpp:51:10:51:14 | inner |
 | complex.cpp:51:16:51:16 | f |
@@ -273,38 +292,15 @@
 | complex.cpp:74:7:74:8 | b3 |
 | complex.cpp:77:7:77:8 | b4 |
 | constructors.cpp:20:24:20:25 | a_ |
+| constructors.cpp:20:24:20:25 | this |
 | constructors.cpp:21:24:21:25 | b_ |
+| constructors.cpp:21:24:21:25 | this |
 | constructors.cpp:28:10:28:10 | f |
 | constructors.cpp:29:10:29:10 | f |
 | constructors.cpp:40:9:40:9 | f |
 | constructors.cpp:43:9:43:9 | g |
 | constructors.cpp:46:9:46:9 | h |
 | constructors.cpp:49:9:49:9 | i |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
-| file://:0:0:0:0 | this |
 | qualifiers.cpp:9:30:9:33 | this |
 | qualifiers.cpp:9:36:9:36 | a |
 | qualifiers.cpp:12:49:12:53 | inner |
@@ -348,7 +344,9 @@
 | qualifiers.cpp:48:16:48:20 | inner |
 | qualifiers.cpp:48:23:48:23 | a |
 | simple.cpp:20:24:20:25 | a_ |
+| simple.cpp:20:24:20:25 | this |
 | simple.cpp:21:24:21:25 | b_ |
+| simple.cpp:21:24:21:25 | this |
 | simple.cpp:28:10:28:10 | f |
 | simple.cpp:29:10:29:10 | f |
 | simple.cpp:39:5:39:5 | f |
@@ -362,7 +360,9 @@
 | simple.cpp:65:5:65:5 | a |
 | simple.cpp:65:7:65:7 | i |
 | simple.cpp:83:9:83:10 | f2 |
+| simple.cpp:83:9:83:10 | this |
 | simple.cpp:83:12:83:13 | f1 |
+| simple.cpp:84:14:84:20 | this |
 | struct_init.c:15:8:15:9 | ab |
 | struct_init.c:15:12:15:12 | a |
 | struct_init.c:16:8:16:9 | ab |