hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-05 21:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

C#: Add active preprocessor conditions as suffix in all TRAP .push instructions

Browse Source
This commit is contained in:
Tom Hvitved
2021-06-21 14:54:53 +02:00
parent 8aa9cd52b5
commit 4f8a103df2
38 changed files with 350 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
csharp/ql/test/library-tests/comments/DefineDirectives.expected
View File

@@ -1 +1,2 @@
| trivia.cs:4:1:4:13 | #define ... | DEBUG |
| trivia.cs:5:1:5:14 | #define ... | DEBUG2 |

14
csharp/ql/test/library-tests/comments/Directives.expected
View File

@@ -1,5 +1,6 @@
directives
| trivia.cs:4:1:4:13 | #define ... | trivia.cs:4:1:4:13 | trivia.cs:4:1:4:13 | active |
| trivia.cs:5:1:5:14 | #define ... | trivia.cs:5:1:5:14 | trivia.cs:5:1:5:14 | active |
| trivia.cs:6:1:6:12 | #undef ... | trivia.cs:6:1:6:12 | trivia.cs:6:1:6:12 | active |
| trivia.cs:12:1:12:35 | #pragma warning ... | trivia.cs:12:1:12:35 | trivia.cs:12:1:12:35 | active |
| trivia.cs:13:1:13:103 | #pragma checksum ... | trivia.cs:13:1:13:103 | trivia.cs:13:1:13:103 | active |
@@ -29,8 +30,15 @@ directives
| trivia.cs:72:1:72:43 | #warning ... | trivia.cs:72:1:72:43 | trivia.cs:72:1:72:43 | active |
| trivia.cs:74:1:74:5 | #else | trivia.cs:74:1:74:5 | trivia.cs:74:1:74:5 | active |
| trivia.cs:76:1:76:6 | #endif | trivia.cs:76:1:76:6 | trivia.cs:76:1:76:6 | active |
| trivia.cs:82:1:82:10 | #if ... | trivia.cs:82:1:82:10 | trivia.cs:82:1:82:10 | active |
| trivia.cs:86:1:86:6 | #endif | trivia.cs:86:1:86:6 | trivia.cs:86:1:86:6 | active |
| trivia.cs:93:1:93:10 | #if ... | trivia.cs:93:1:93:10 | trivia.cs:93:1:93:10 | active |
| trivia.cs:95:1:95:6 | #endif | trivia.cs:95:1:95:6 | trivia.cs:95:1:95:6 | active |
| trivia.cs:103:1:103:10 | #if ... | trivia.cs:103:1:103:10 | trivia.cs:103:1:103:10 | active |
| trivia.cs:105:1:105:6 | #endif | trivia.cs:105:1:105:6 | trivia.cs:105:1:105:6 | active |
comp
| trivia.cs:4:1:4:13 | #define ... | compilation |
| trivia.cs:5:1:5:14 | #define ... | compilation |
| trivia.cs:6:1:6:12 | #undef ... | compilation |
| trivia.cs:12:1:12:35 | #pragma warning ... | compilation |
| trivia.cs:13:1:13:103 | #pragma checksum ... | compilation |
@@ -60,3 +68,9 @@ comp
| trivia.cs:72:1:72:43 | #warning ... | compilation |
| trivia.cs:74:1:74:5 | #else | compilation |
| trivia.cs:76:1:76:6 | #endif | compilation |
| trivia.cs:82:1:82:10 | #if ... | compilation |
| trivia.cs:86:1:86:6 | #endif | compilation |
| trivia.cs:93:1:93:10 | #if ... | compilation |
| trivia.cs:95:1:95:6 | #endif | compilation |
| trivia.cs:103:1:103:10 | #if ... | compilation |
| trivia.cs:105:1:105:6 | #endif | compilation |

9
csharp/ql/test/library-tests/comments/IfDirectives.expected
View File

@@ -1,6 +1,9 @@
ifDirectives
| trivia.cs:65:1:65:9 | #if ... | trivia.cs:76:1:76:6 | #endif | not taken | false | trivia.cs:65:5:65:9 | DEBUG |
| trivia.cs:68:1:68:10 | #if ... | trivia.cs:70:1:70:6 | #endif | not taken | false | trivia.cs:68:5:68:10 | NESTED |
| trivia.cs:82:1:82:10 | #if ... | trivia.cs:86:1:86:6 | #endif | taken | true | trivia.cs:82:5:82:10 | DEBUG2 |
| trivia.cs:93:1:93:10 | #if ... | trivia.cs:95:1:95:6 | #endif | taken | true | trivia.cs:93:5:93:10 | DEBUG2 |
| trivia.cs:103:1:103:10 | #if ... | trivia.cs:105:1:105:6 | #endif | taken | true | trivia.cs:103:5:103:10 | DEBUG2 |
siblings
| trivia.cs:65:1:65:9 | #if ... | trivia.cs:71:1:71:35 | #elif ... | 0 | taken |
| trivia.cs:65:1:65:9 | #if ... | trivia.cs:74:1:74:5 | #else | 1 | not taken |
@@ -8,6 +11,9 @@ conditionalDirectives
| trivia.cs:65:1:65:9 | #if ... | not taken | false | trivia.cs:65:5:65:9 | DEBUG |
| trivia.cs:68:1:68:10 | #if ... | not taken | false | trivia.cs:68:5:68:10 | NESTED |
| trivia.cs:71:1:71:35 | #elif ... | taken | true | trivia.cs:71:7:71:35 | ... \|\| ... |
| trivia.cs:82:1:82:10 | #if ... | taken | true | trivia.cs:82:5:82:10 | DEBUG2 |
| trivia.cs:93:1:93:10 | #if ... | taken | true | trivia.cs:93:5:93:10 | DEBUG2 |
| trivia.cs:103:1:103:10 | #if ... | taken | true | trivia.cs:103:5:103:10 | DEBUG2 |
expressions
| trivia.cs:65:5:65:9 | DEBUG |
| trivia.cs:68:5:68:10 | NESTED |
@@ -17,3 +23,6 @@ expressions
| trivia.cs:71:20:71:23 | true |
| trivia.cs:71:29:71:35 | !... |
| trivia.cs:71:31:71:34 | TEST |
| trivia.cs:82:5:82:10 | DEBUG2 |
| trivia.cs:93:5:93:10 | DEBUG2 |
| trivia.cs:103:5:103:10 | DEBUG2 |

29
csharp/ql/test/library-tests/comments/PrintAst.expected
View File

@@ -177,3 +177,32 @@ trivia.cs:
# 73| -1: [TypeMention] int
# 73| 0: [LocalVariableAccess] access to local variable i
# 73| 1: [IntLiteral] 1
# 80| [Class] Tr5
# 83| 5: [Method] M1
# 83| -1: [TypeMention] Void
# 84| 4: [BlockStmt] {...}
# 88| 6: [Method] M2
# 88| -1: [TypeMention] Void
# 89| 4: [BlockStmt] {...}
# 92| 7: [Field] F1
# 92| -1: [TypeMention] int
# 92| 1: [AssignExpr] ... = ...
# 92| 0: [FieldAccess] access to field F1
# 94| 1: [IntLiteral] 10
# 98| 8: [Field] F2
# 98| -1: [TypeMention] int
# 98| 1: [AssignExpr] ... = ...
# 98| 0: [FieldAccess] access to field F2
# 98| 1: [IntLiteral] 0
# 100| 9: [Property] P1
# 100| -1: [TypeMention] int
# 102| 3: [Getter] get_P1
# 104| 4: [Setter] set_P1
#-----| 2: (Parameters)
# 104| 0: [Parameter] value
# 108| 10: [Property] P2
# 108| -1: [TypeMention] int
# 108| 3: [Getter] get_P2
# 108| 4: [Setter] set_P2
#-----| 2: (Parameters)
# 108| 0: [Parameter] value

35
csharp/ql/test/library-tests/comments/trivia.cs
View File

@@ -2,7 +2,7 @@
// Start of trivia.cs
// Unassociated
#define DEBUG
#define DEBUG2
#undef DEBUG
using System;
@@ -75,4 +75,35 @@ class Tr4
var i = 2;
#endif
}
}
}
class Tr5
{
#if DEBUG2
static void M1()
{
}
#endif
static void M2()
{
}
public int F1
#if DEBUG2
= 10
#endif
;
public int F2 = 0;
public int P1
{
get;
#if DEBUG2
set;
#endif
}
public int P2 { get; set; }
}