Skip to content

Commit 2860792

Browse files
hvitvedhvitved
committed
C#: Update CIL tests
1 parent de4ed59 commit 2860792

4 files changed

Lines changed: 46 additions & 44 deletions

File tree

‎csharp/ql/src/semmle/code/cil/ConsistencyChecks.qll‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,9 @@ class InvalidOverride extends MethodViolation {
477477
}
478478

479479
override string getMessage() {
480-
result = "Overridden method from " + base.getDeclaringType() + " is not in a base type"
480+
result =
481+
"Overridden method from " + base.getDeclaringType().getQualifiedName() +
482+
" is not in a base type"
481483
}
482484
}
483485

‎csharp/ql/test/library-tests/cil/consistency/consistency.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
| Finalize | Overridden method from Object is not in a base type |
1+
| Finalize | Overridden method from System.Object is not in a base type |

‎csharp/ql/test/library-tests/cil/pdbs/InstructionLocations.expected‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
1-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:6:3:6:4 | nop |
2-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | br.s |
3-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | ldc.i4.1 |
4-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | stloc.0 |
5-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:8:3:8:4 | ldloc.0 |
6-
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:8:3:8:4 | ret |
7-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:6:3:6:4 | nop |
8-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:7:4:7:20 | ldc.i4.1 |
9-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:7:4:7:20 | stloc.0 |
10-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | br.s |
11-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | ldc.i4.1 |
12-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | stloc.1 |
13-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | brtrue.s |
14-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | ceq |
15-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | cgt |
16-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | ldarg.1 |
17-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | ldc.i4.0 |
18-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | ldloc.1 |
19-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | ldloc.2 |
20-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | stloc.2 |
21-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | add |
22-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | ldc.i4.1 |
23-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | ldloc.1 |
24-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | stloc.1 |
25-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | ldloc.0 |
26-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | ldloc.1 |
27-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | mul |
28-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | stloc.0 |
29-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | br.s |
30-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | ldloc.0 |
31-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | stloc.3 |
32-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | ldloc.3 |
33-
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | ret |
34-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | call |
35-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ldarg.0 |
36-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | nop |
37-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ret |
38-
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | call |
39-
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ldarg.0 |
40-
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | nop |
41-
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ret |
1+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:6:3:6:4 | 0: nop |
2+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | 1: ldc.i4.1 |
3+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | 2: stloc.0 L0 |
4+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:7:4:7:13 | 3: br.s 4: |
5+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:8:3:8:4 | 4: ldloc.0 |
6+
| C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:8:3:8:4 | 5: ret |
7+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:6:3:6:4 | 0: nop |
8+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:7:4:7:20 | 1: ldc.i4.1 |
9+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:7:4:7:20 | 2: stloc.0 L0 |
10+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | 3: ldc.i4.1 |
11+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | 4: stloc.1 L1 |
12+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:9:8:18 | 5: br.s 14: |
13+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 14: ldloc.1 |
14+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 15: ldarg.1 |
15+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 16: cgt |
16+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 17: ldc.i4.0 |
17+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 18: ceq |
18+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 19: stloc.2 L2 |
19+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 20: ldloc.2 |
20+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:20:8:26 | 21: brtrue.s 6: |
21+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | 10: ldloc.1 |
22+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | 11: ldc.i4.1 |
23+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | 12: add |
24+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:8:28:8:31 | 13: stloc.1 L1 |
25+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | 6: ldloc.0 |
26+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | 7: ldloc.1 |
27+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | 8: mul |
28+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:9:5:9:18 | 9: stloc.0 L0 |
29+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | 22: ldloc.0 |
30+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | 23: stloc.3 L3 |
31+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | 24: br.s 25: |
32+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | 25: ldloc.3 |
33+
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | 26: ret |
34+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 0: ldarg.0 |
35+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 1: call System.Object..ctor |
36+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 2: nop |
37+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 3: ret |
38+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 0: ldarg.0 |
39+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 1: call System.Object..ctor |
40+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 2: nop |
41+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 3: ret |

‎csharp/ql/test/library-tests/cil/pdbs/InstructionLocations.ql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ from CIL::Instruction instruction, CIL::Location location
1111
where
1212
location = instruction.getLocation() and
1313
filterMethod(instruction.getImplementation().getMethod())
14-
select location.toString(), instruction.toString()
14+
select location.toString(), instruction.toStringExtra()

0 commit comments

Comments
 (0)