Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8db46bc

Browse files
calumgrantcalumgrant
committed
C#: More tests for nullable flow state.
1 parent 6c9ebab commit 8db46bc

3 files changed

Lines changed: 164 additions & 66 deletions

File tree

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.cs‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,44 @@ MyClass Fn(MyClass p)
165165
struct MyStruct
166166
{
167167
}
168+
169+
#nullable enable
170+
171+
abstract class TestNullableFlowStates
172+
{
173+
public abstract string? MaybeNull();
174+
175+
public abstract void Check(string? isNull);
176+
177+
public abstract int Count();
178+
179+
void LoopUnrolling()
180+
{
181+
string? x = MaybeNull();
182+
183+
Check(x); // x is maybe null
184+
185+
for (int i = 0; i < 10; ++i)
186+
{
187+
x = "not null any more";
188+
}
189+
190+
Check(x); // x maybe null - loop unrolling not detected
191+
}
192+
193+
void ExceptionFlow()
194+
{
195+
string? y = MaybeNull();
196+
197+
try
198+
{
199+
throw new ArgumentException();
200+
}
201+
finally
202+
{
203+
y = "not null";
204+
}
205+
206+
Check(y); // y not null - finally flow is detected
207+
}
208+
}

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.expected‎

Lines changed: 117 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,12 @@ returnTypes
191191
| NullableRefTypes.cs:157:18:157:30 | get_P | MyClass |
192192
| NullableRefTypes.cs:158:13:158:14 | Fn | MyClass |
193193
| NullableRefTypes.cs:165:8:165:15 | MyStruct | Void! |
194+
| NullableRefTypes.cs:171:16:171:37 | TestNullableFlowStates | Void! |
195+
| NullableRefTypes.cs:173:29:173:37 | MaybeNull | string? |
196+
| NullableRefTypes.cs:175:26:175:30 | Check | Void! |
197+
| NullableRefTypes.cs:177:25:177:29 | Count | int! |
198+
| NullableRefTypes.cs:179:10:179:22 | LoopUnrolling | Void! |
199+
| NullableRefTypes.cs:193:10:193:22 | ExceptionFlow | Void! |
194200
methodTypeArguments
195201
| NullableRefTypes.cs:51:12:51:15 | Q | 0 | MyClass! |
196202
| NullableRefTypes.cs:51:12:51:15 | Q | 0 | MyClass? |
@@ -315,62 +321,114 @@ expressionTypes
315321
| NullableRefTypes.cs:160:17:160:21 | MyClass a = ... | MyClass! |
316322
| NullableRefTypes.cs:160:21:160:21 | access to parameter p | MyClass! |
317323
| NullableRefTypes.cs:161:16:161:16 | access to local variable a | MyClass! |
318-
exprMaybeNull
319-
| NullableRefTypes.cs:13:19:13:22 | null |
320-
| NullableRefTypes.cs:17:29:17:32 | null |
321-
| NullableRefTypes.cs:26:50:26:53 | null |
322-
| NullableRefTypes.cs:27:50:27:53 | null |
323-
| NullableRefTypes.cs:30:21:30:24 | null |
324-
| NullableRefTypes.cs:38:22:38:25 | null |
325-
| NullableRefTypes.cs:39:29:39:29 | access to local variable b |
326-
| NullableRefTypes.cs:40:30:40:30 | access to local variable b |
327-
| NullableRefTypes.cs:51:44:51:47 | null |
328-
| NullableRefTypes.cs:73:22:73:25 | null |
329-
| NullableRefTypes.cs:74:19:74:19 | access to local variable x |
330-
| NullableRefTypes.cs:75:11:75:11 | access to local variable x |
331-
| NullableRefTypes.cs:87:9:87:16 | ... = ... |
332-
| NullableRefTypes.cs:87:13:87:16 | null |
333-
| NullableRefTypes.cs:94:17:94:25 | ... ?? ... |
334-
| NullableRefTypes.cs:94:22:94:25 | null |
335-
| NullableRefTypes.cs:95:20:95:20 | access to local variable x |
336-
| NullableRefTypes.cs:96:27:96:27 | access to local variable x |
337-
| NullableRefTypes.cs:104:52:104:52 | access to parameter r |
338-
| NullableRefTypes.cs:105:61:105:61 | access to parameter r |
339-
| NullableRefTypes.cs:108:60:108:60 | access to parameter r |
340-
| NullableRefTypes.cs:110:64:110:67 | null |
341-
exprNotNull
342-
| NullableRefTypes.cs:14:18:14:21 | this access |
343-
| NullableRefTypes.cs:18:31:18:34 | this access |
344-
| NullableRefTypes.cs:19:33:19:36 | this access |
345-
| NullableRefTypes.cs:26:44:26:53 | throw ... |
346-
| NullableRefTypes.cs:27:44:27:53 | throw ... |
347-
| NullableRefTypes.cs:31:20:31:23 | this access |
348-
| NullableRefTypes.cs:37:21:37:33 | object creation of type MyClass |
349-
| NullableRefTypes.cs:74:9:74:20 | call to method GenericFn |
350-
| NullableRefTypes.cs:75:9:75:12 | call to method Q |
351-
| NullableRefTypes.cs:76:16:76:32 | default(...) |
352-
| NullableRefTypes.cs:84:21:84:28 | "source" |
353-
| NullableRefTypes.cs:85:20:85:20 | access to local variable x |
354-
| NullableRefTypes.cs:85:20:85:21 | ...! |
355-
| NullableRefTypes.cs:86:9:86:9 | access to local variable y |
356-
| NullableRefTypes.cs:86:9:86:14 | ... = ... |
357-
| NullableRefTypes.cs:86:13:86:13 | access to local variable x |
358-
| NullableRefTypes.cs:86:13:86:14 | ...! |
359-
| NullableRefTypes.cs:87:9:87:9 | access to local variable x |
360-
| NullableRefTypes.cs:88:9:88:9 | access to local variable y |
361-
| NullableRefTypes.cs:88:9:88:14 | ... = ... |
362-
| NullableRefTypes.cs:88:13:88:13 | access to local variable x |
363-
| NullableRefTypes.cs:88:13:88:14 | ...! |
364-
| NullableRefTypes.cs:93:21:93:28 | "source" |
365-
| NullableRefTypes.cs:94:17:94:17 | access to local variable x |
366-
| NullableRefTypes.cs:96:9:96:15 | access to type Console |
367-
| NullableRefTypes.cs:96:9:96:28 | call to method WriteLine |
368-
| NullableRefTypes.cs:103:52:103:52 | access to parameter r |
369-
| NullableRefTypes.cs:106:60:106:60 | access to parameter r |
370-
| NullableRefTypes.cs:107:59:107:59 | access to parameter r |
371-
| NullableRefTypes.cs:110:58:110:67 | throw ... |
372-
| NullableRefTypes.cs:113:36:113:43 | access to field Property |
373-
| NullableRefTypes.cs:113:36:113:44 | ...! |
374-
| NullableRefTypes.cs:157:18:157:30 | object creation of type MyClass |
375-
| NullableRefTypes.cs:160:21:160:21 | access to parameter p |
376-
| NullableRefTypes.cs:161:16:161:16 | access to local variable a |
324+
| NullableRefTypes.cs:181:17:181:17 | access to local variable x | string! |
325+
| NullableRefTypes.cs:181:17:181:31 | String x = ... | string! |
326+
| NullableRefTypes.cs:181:21:181:31 | call to method MaybeNull | string? |
327+
| NullableRefTypes.cs:181:21:181:31 | this access | TestNullableFlowStates |
328+
| NullableRefTypes.cs:183:9:183:16 | call to method Check | Void! |
329+
| NullableRefTypes.cs:183:9:183:16 | this access | TestNullableFlowStates |
330+
| NullableRefTypes.cs:183:15:183:15 | access to local variable x | string? |
331+
| NullableRefTypes.cs:185:18:185:18 | access to local variable i | int! |
332+
| NullableRefTypes.cs:185:18:185:22 | Int32 i = ... | int! |
333+
| NullableRefTypes.cs:185:22:185:22 | 0 | int! |
334+
| NullableRefTypes.cs:185:25:185:25 | access to local variable i | int! |
335+
| NullableRefTypes.cs:185:25:185:30 | ... < ... | bool! |
336+
| NullableRefTypes.cs:185:29:185:30 | 10 | int! |
337+
| NullableRefTypes.cs:185:33:185:35 | ++... | int! |
338+
| NullableRefTypes.cs:185:35:185:35 | access to local variable i | int! |
339+
| NullableRefTypes.cs:187:13:187:13 | access to local variable x | string? |
340+
| NullableRefTypes.cs:187:13:187:35 | ... = ... | string! |
341+
| NullableRefTypes.cs:187:17:187:35 | "not null any more" | string! |
342+
| NullableRefTypes.cs:190:9:190:16 | call to method Check | Void! |
343+
| NullableRefTypes.cs:190:9:190:16 | this access | TestNullableFlowStates |
344+
| NullableRefTypes.cs:190:15:190:15 | access to local variable x | string? |
345+
| NullableRefTypes.cs:195:17:195:17 | access to local variable y | string! |
346+
| NullableRefTypes.cs:195:17:195:31 | String y = ... | string! |
347+
| NullableRefTypes.cs:195:21:195:31 | call to method MaybeNull | string? |
348+
| NullableRefTypes.cs:195:21:195:31 | this access | TestNullableFlowStates |
349+
| NullableRefTypes.cs:199:19:199:41 | object creation of type ArgumentException | ArgumentException! |
350+
| NullableRefTypes.cs:203:13:203:13 | access to local variable y | string? |
351+
| NullableRefTypes.cs:203:13:203:26 | ... = ... | string! |
352+
| NullableRefTypes.cs:203:17:203:26 | "not null" | string! |
353+
| NullableRefTypes.cs:206:9:206:16 | call to method Check | Void! |
354+
| NullableRefTypes.cs:206:9:206:16 | this access | TestNullableFlowStates |
355+
| NullableRefTypes.cs:206:15:206:15 | access to local variable y | string! |
356+
exprFlowState
357+
| NullableRefTypes.cs:13:19:13:22 | null | Maybe null |
358+
| NullableRefTypes.cs:14:18:14:21 | this access | Not null |
359+
| NullableRefTypes.cs:17:29:17:32 | null | Maybe null |
360+
| NullableRefTypes.cs:18:31:18:34 | this access | Not null |
361+
| NullableRefTypes.cs:19:33:19:36 | this access | Not null |
362+
| NullableRefTypes.cs:26:44:26:53 | throw ... | Not null |
363+
| NullableRefTypes.cs:26:50:26:53 | null | Maybe null |
364+
| NullableRefTypes.cs:27:44:27:53 | throw ... | Not null |
365+
| NullableRefTypes.cs:27:50:27:53 | null | Maybe null |
366+
| NullableRefTypes.cs:30:21:30:24 | null | Maybe null |
367+
| NullableRefTypes.cs:31:20:31:23 | this access | Not null |
368+
| NullableRefTypes.cs:37:21:37:33 | object creation of type MyClass | Not null |
369+
| NullableRefTypes.cs:38:22:38:25 | null | Maybe null |
370+
| NullableRefTypes.cs:39:29:39:29 | access to local variable b | Maybe null |
371+
| NullableRefTypes.cs:40:30:40:30 | access to local variable b | Maybe null |
372+
| NullableRefTypes.cs:51:44:51:47 | null | Maybe null |
373+
| NullableRefTypes.cs:73:22:73:25 | null | Maybe null |
374+
| NullableRefTypes.cs:74:9:74:20 | call to method GenericFn | Not null |
375+
| NullableRefTypes.cs:74:19:74:19 | access to local variable x | Maybe null |
376+
| NullableRefTypes.cs:75:9:75:12 | call to method Q | Not null |
377+
| NullableRefTypes.cs:75:11:75:11 | access to local variable x | Maybe null |
378+
| NullableRefTypes.cs:76:16:76:32 | default(...) | Not null |
379+
| NullableRefTypes.cs:84:21:84:28 | "source" | Not null |
380+
| NullableRefTypes.cs:85:20:85:20 | access to local variable x | Not null |
381+
| NullableRefTypes.cs:85:20:85:21 | ...! | Not null |
382+
| NullableRefTypes.cs:86:9:86:9 | access to local variable y | Not null |
383+
| NullableRefTypes.cs:86:9:86:14 | ... = ... | Not null |
384+
| NullableRefTypes.cs:86:13:86:13 | access to local variable x | Not null |
385+
| NullableRefTypes.cs:86:13:86:14 | ...! | Not null |
386+
| NullableRefTypes.cs:87:9:87:9 | access to local variable x | Not null |
387+
| NullableRefTypes.cs:87:9:87:16 | ... = ... | Maybe null |
388+
| NullableRefTypes.cs:87:13:87:16 | null | Maybe null |
389+
| NullableRefTypes.cs:88:9:88:9 | access to local variable y | Not null |
390+
| NullableRefTypes.cs:88:9:88:14 | ... = ... | Not null |
391+
| NullableRefTypes.cs:88:13:88:13 | access to local variable x | Not null |
392+
| NullableRefTypes.cs:88:13:88:14 | ...! | Not null |
393+
| NullableRefTypes.cs:93:21:93:28 | "source" | Not null |
394+
| NullableRefTypes.cs:94:17:94:17 | access to local variable x | Not null |
395+
| NullableRefTypes.cs:94:17:94:25 | ... ?? ... | Maybe null |
396+
| NullableRefTypes.cs:94:22:94:25 | null | Maybe null |
397+
| NullableRefTypes.cs:95:20:95:20 | access to local variable x | Maybe null |
398+
| NullableRefTypes.cs:96:9:96:15 | access to type Console | Not null |
399+
| NullableRefTypes.cs:96:9:96:28 | call to method WriteLine | Not null |
400+
| NullableRefTypes.cs:96:27:96:27 | access to local variable x | Maybe null |
401+
| NullableRefTypes.cs:103:52:103:52 | access to parameter r | Not null |
402+
| NullableRefTypes.cs:104:52:104:52 | access to parameter r | Maybe null |
403+
| NullableRefTypes.cs:105:61:105:61 | access to parameter r | Maybe null |
404+
| NullableRefTypes.cs:106:60:106:60 | access to parameter r | Not null |
405+
| NullableRefTypes.cs:107:59:107:59 | access to parameter r | Not null |
406+
| NullableRefTypes.cs:108:60:108:60 | access to parameter r | Maybe null |
407+
| NullableRefTypes.cs:110:58:110:67 | throw ... | Not null |
408+
| NullableRefTypes.cs:110:64:110:67 | null | Maybe null |
409+
| NullableRefTypes.cs:113:36:113:43 | access to field Property | Not null |
410+
| NullableRefTypes.cs:113:36:113:44 | ...! | Not null |
411+
| NullableRefTypes.cs:157:18:157:30 | object creation of type MyClass | Not null |
412+
| NullableRefTypes.cs:160:21:160:21 | access to parameter p | Not null |
413+
| NullableRefTypes.cs:161:16:161:16 | access to local variable a | Not null |
414+
| NullableRefTypes.cs:181:21:181:31 | call to method MaybeNull | Maybe null |
415+
| NullableRefTypes.cs:183:9:183:16 | call to method Check | Not null |
416+
| NullableRefTypes.cs:183:15:183:15 | access to local variable x | Maybe null |
417+
| NullableRefTypes.cs:185:22:185:22 | 0 | Not null |
418+
| NullableRefTypes.cs:185:25:185:25 | access to local variable i | Not null |
419+
| NullableRefTypes.cs:185:25:185:30 | ... < ... | Not null |
420+
| NullableRefTypes.cs:185:29:185:30 | 10 | Not null |
421+
| NullableRefTypes.cs:185:33:185:35 | ++... | Not null |
422+
| NullableRefTypes.cs:185:35:185:35 | access to local variable i | Not null |
423+
| NullableRefTypes.cs:187:13:187:13 | access to local variable x | Maybe null |
424+
| NullableRefTypes.cs:187:13:187:35 | ... = ... | Not null |
425+
| NullableRefTypes.cs:187:17:187:35 | "not null any more" | Not null |
426+
| NullableRefTypes.cs:190:9:190:16 | call to method Check | Not null |
427+
| NullableRefTypes.cs:190:15:190:15 | access to local variable x | Maybe null |
428+
| NullableRefTypes.cs:195:21:195:31 | call to method MaybeNull | Maybe null |
429+
| NullableRefTypes.cs:199:19:199:41 | object creation of type ArgumentException | Not null |
430+
| NullableRefTypes.cs:203:13:203:13 | access to local variable y | Maybe null |
431+
| NullableRefTypes.cs:203:13:203:26 | ... = ... | Not null |
432+
| NullableRefTypes.cs:203:17:203:26 | "not null" | Not null |
433+
| NullableRefTypes.cs:206:9:206:16 | call to method Check | Not null |
434+
| NullableRefTypes.cs:206:15:206:15 | access to local variable y | Not null |

‎csharp/ql/test/library-tests/csharp8/NullableRefTypes.ql‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ query predicate expressionTypes(Expr expr, string type) {
6868
expr.getFile().getBaseName() = "NullableRefTypes.cs"
6969
}
7070

71-
query predicate exprMaybeNull(Expr expr) {
71+
query predicate exprFlowState(Expr expr, string state) {
7272
expr.getFile().getBaseName() = "NullableRefTypes.cs" and
73-
expr.hasMaybeNullFlowState()
74-
}
75-
76-
query predicate exprNotNull(Expr expr) {
77-
expr.getFile().getBaseName() = "NullableRefTypes.cs" and
78-
expr.hasNotNullFlowState()
73+
(
74+
expr.hasMaybeNullFlowState() and state = "Maybe null"
75+
or
76+
expr.hasNotNullFlowState() and state = "Not null"
77+
)
7978
}

0 commit comments

Comments
 (0)