hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #888 from dave-bartolomeo/dave/Capture

Browse Source 
C++: Update captures test for closure fields extractor fix
This commit is contained in:
ian-semmle
2019-02-07 22:54:01 +00:00
committed by GitHub
parent 87c5872bc5 f460d2c1c3
commit f337c9faf4
4 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpp/ql/test/library-tests/lambdas/captures/captures.cpp
View File

@@ -10,4 +10,10 @@ struct foo {
b(x + 1);
};
}
static void c(int x) {
[x] {
c(0); // `x` is unused, but still captured.
};
}
};

13
cpp/ql/test/library-tests/lambdas/captures/captures.expected
View File

@@ -1,7 +1,6 @@
| captures.cpp:3:6:3:6 | x | explicit |
| captures.cpp:3:9:3:12 | (captured this) | explicit |
| captures.cpp:3:9:3:12 | x | explicit |
| captures.cpp:10:7:10:7 | (captured this) | implicit |
| captures.cpp:10:9:10:9 | (captured this) | implicit |
| captures.cpp:10:9:10:9 | x | implicit |
| end_pos.cpp:9:17:9:18 | ii | explicit |
| captures.cpp:3:6:3:6 | x | explicit | 1 |
| captures.cpp:3:9:3:12 | (captured this) | explicit | 2 |
| captures.cpp:10:7:10:7 | (captured this) | implicit | 1 |
| captures.cpp:10:9:10:9 | x | implicit | 2 |
| captures.cpp:15:6:15:6 | x | explicit | 1 |
| end_pos.cpp:9:17:9:18 | ii | explicit | 1 |

8
cpp/ql/test/library-tests/lambdas/captures/captures.ql
View File

@@ -1,5 +1,7 @@
import cpp
from LambdaCapture lc, string mode
where if lc.isImplicit() then mode = "implicit" else mode = "explicit"
select lc, mode
from LambdaCapture lc, string mode, int index
where
exists(LambdaExpression le | le.getCapture(index) = lc) and
if lc.isImplicit() then mode = "implicit" else mode = "explicit"
select lc, mode, index

39
cpp/ql/test/library-tests/lambdas/captures/elements.expected
View File

@@ -65,6 +65,34 @@
| captures.cpp:10:13:10:13 | 1 |
| captures.cpp:11:5:11:5 | return ... |
| captures.cpp:12:3:12:3 | return ... |
| captures.cpp:14:15:14:15 | c |
| captures.cpp:14:15:14:15 | definition of c |
| captures.cpp:14:21:14:21 | definition of x |
| captures.cpp:14:21:14:21 | x |
| captures.cpp:14:24:18:3 | { ... } |
| captures.cpp:15:5:15:5 | (constructor) |
| captures.cpp:15:5:15:5 | (constructor) |
| captures.cpp:15:5:15:5 | (constructor) |
| captures.cpp:15:5:15:5 | declaration of (null) |
| captures.cpp:15:5:15:5 | declaration of (null) |
| captures.cpp:15:5:15:5 | definition of (null) |
| captures.cpp:15:5:15:5 | definition of operator= |
| captures.cpp:15:5:15:5 | operator= |
| captures.cpp:15:5:17:5 | [...](...){...} |
| captures.cpp:15:5:17:5 | {...} |
| captures.cpp:15:5:17:6 | ExprStmt |
| captures.cpp:15:6:15:6 | definition of x |
| captures.cpp:15:6:15:6 | x |
| captures.cpp:15:6:15:6 | x |
| captures.cpp:15:9:15:9 | definition of operator() |
| captures.cpp:15:9:15:9 | operator() |
| captures.cpp:15:9:17:5 | { ... } |
| captures.cpp:16:7:16:7 | call to c |
| captures.cpp:16:7:16:11 | ExprStmt |
| captures.cpp:16:9:16:9 | 0 |
| captures.cpp:16:13:16:49 | // `x` is unused, but still captured. |
| captures.cpp:17:5:17:5 | return ... |
| captures.cpp:18:3:18:3 | return ... |
| end_pos.cpp:0:0:0:0 | end_pos.cpp |
| end_pos.cpp:2:1:2:14 | #define OPEN { |
| end_pos.cpp:3:6:3:10 | definition of igFun |
@@ -131,6 +159,8 @@
| file://:0:0:0:0 | const lambda [] type at line 9, col. 5 *const |
| file://:0:0:0:0 | const lambda [] type at line 9, col. 15 |
| file://:0:0:0:0 | const lambda [] type at line 9, col. 15 & |
| file://:0:0:0:0 | const lambda [] type at line 15, col. 5 |
| file://:0:0:0:0 | const lambda [] type at line 15, col. 5 & |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
@@ -142,6 +172,10 @@
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | declaration of 1st parameter |
| file://:0:0:0:0 | decltype([...](...){...}) |
| file://:0:0:0:0 | decltype([...](...){...}) |
| file://:0:0:0:0 | decltype([...](...){...}) |
| file://:0:0:0:0 | decltype([...](...){...}) |
@@ -164,6 +198,8 @@
| file://:0:0:0:0 | lambda [] type at line 9, col. 5 * |
| file://:0:0:0:0 | lambda [] type at line 9, col. 15 & |
| file://:0:0:0:0 | lambda [] type at line 9, col. 15 && |
| file://:0:0:0:0 | lambda [] type at line 15, col. 5 & |
| file://:0:0:0:0 | lambda [] type at line 15, col. 5 && |
| file://:0:0:0:0 | operator= |
| file://:0:0:0:0 | operator= |
| file://:0:0:0:0 | overflow_arg_area |
@@ -180,6 +216,9 @@
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | p#0 |
| file://:0:0:0:0 | reg_save_area |
| file://:0:0:0:0 | this |
| file://:0:0:0:0 | this |