Skip to content

Commit 97aa301

Browse files
MathiasVPMathiasVP
committed
C++: Accept more test changes.
1 parent 88bfb81 commit 97aa301

File tree

1 file changed

+70
-0
lines changed

1 file changed

+70
-0
lines changed

‎cpp/ql/test/library-tests/controlflow/guards-ir/tests.expected

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,19 +530,27 @@ irGuardsCompare
530530
| 7 | 0 < x+0 when CompareGT: ... > ... is true |
531531
| 7 | 0 >= x+0 when CompareGT: ... > ... is false |
532532
| 7 | x < 0+1 when CompareGT: ... > ... is false |
533+
| 7 | x < 1 when CompareGT: ... > ... is false |
533534
| 7 | x >= 0+1 when CompareGT: ... > ... is true |
535+
| 7 | x >= 1 when CompareGT: ... > ... is true |
534536
| 17 | 0 < x+1 when CompareLT: ... < ... is false |
535537
| 17 | 0 >= x+1 when CompareLT: ... < ... is true |
536538
| 17 | 1 < y+0 when CompareGT: ... > ... is true |
537539
| 17 | 1 >= y+0 when CompareGT: ... > ... is false |
540+
| 17 | x < 0 when CompareLT: ... < ... is true |
538541
| 17 | x < 0+0 when CompareLT: ... < ... is true |
542+
| 17 | x >= 0 when CompareLT: ... < ... is false |
539543
| 17 | x >= 0+0 when CompareLT: ... < ... is false |
540544
| 17 | y < 1+1 when CompareGT: ... > ... is false |
545+
| 17 | y < 2 when CompareGT: ... > ... is false |
541546
| 17 | y >= 1+1 when CompareGT: ... > ... is true |
547+
| 17 | y >= 2 when CompareGT: ... > ... is true |
542548
| 26 | 0 < x+0 when CompareGT: ... > ... is true |
543549
| 26 | 0 >= x+0 when CompareGT: ... > ... is false |
544550
| 26 | x < 0+1 when CompareGT: ... > ... is false |
551+
| 26 | x < 1 when CompareGT: ... > ... is false |
545552
| 26 | x >= 0+1 when CompareGT: ... > ... is true |
553+
| 26 | x >= 1 when CompareGT: ... > ... is true |
546554
| 31 | - ... != x+0 when CompareEQ: ... == ... is false |
547555
| 31 | - ... == x+0 when CompareEQ: ... == ... is true |
548556
| 31 | x != -1 when CompareEQ: ... == ... is false |
@@ -551,20 +559,28 @@ irGuardsCompare
551559
| 31 | x == - ...+0 when CompareEQ: ... == ... is true |
552560
| 34 | 10 < j+1 when CompareLT: ... < ... is false |
553561
| 34 | 10 >= j+1 when CompareLT: ... < ... is true |
562+
| 34 | j < 10 when CompareLT: ... < ... is true |
554563
| 34 | j < 10+0 when CompareLT: ... < ... is true |
564+
| 34 | j >= 10 when CompareLT: ... < ... is false |
555565
| 34 | j >= 10+0 when CompareLT: ... < ... is false |
556566
| 42 | 10 < j+1 when CompareLT: ... < ... is false |
557567
| 42 | 10 >= j+1 when CompareLT: ... < ... is true |
568+
| 42 | j < 10 when CompareLT: ... < ... is true |
558569
| 42 | j < 10+0 when CompareLT: ... < ... is true |
570+
| 42 | j >= 10 when CompareLT: ... < ... is false |
559571
| 42 | j >= 10+0 when CompareLT: ... < ... is false |
560572
| 44 | 0 < z+0 when CompareGT: ... > ... is true |
561573
| 44 | 0 >= z+0 when CompareGT: ... > ... is false |
562574
| 44 | z < 0+1 when CompareGT: ... > ... is false |
575+
| 44 | z < 1 when CompareGT: ... > ... is false |
563576
| 44 | z >= 0+1 when CompareGT: ... > ... is true |
577+
| 44 | z >= 1 when CompareGT: ... > ... is true |
564578
| 45 | 0 < y+0 when CompareGT: ... > ... is true |
565579
| 45 | 0 >= y+0 when CompareGT: ... > ... is false |
566580
| 45 | y < 0+1 when CompareGT: ... > ... is false |
581+
| 45 | y < 1 when CompareGT: ... > ... is false |
567582
| 45 | y >= 0+1 when CompareGT: ... > ... is true |
583+
| 45 | y >= 1 when CompareGT: ... > ... is true |
568584
| 58 | 0 != x+0 when CompareEQ: ... == ... is false |
569585
| 58 | 0 < y+1 when CompareLT: ... < ... is false |
570586
| 58 | 0 == x+0 when CompareEQ: ... == ... is true |
@@ -573,7 +589,9 @@ irGuardsCompare
573589
| 58 | x != 0+0 when CompareEQ: ... == ... is false |
574590
| 58 | x == 0 when CompareEQ: ... == ... is true |
575591
| 58 | x == 0+0 when CompareEQ: ... == ... is true |
592+
| 58 | y < 0 when CompareLT: ... < ... is true |
576593
| 58 | y < 0+0 when CompareLT: ... < ... is true |
594+
| 58 | y >= 0 when CompareLT: ... < ... is false |
577595
| 58 | y >= 0+0 when CompareLT: ... < ... is false |
578596
| 75 | 0 != x+0 when CompareEQ: ... == ... is false |
579597
| 75 | 0 == x+0 when CompareEQ: ... == ... is true |
@@ -601,7 +619,9 @@ irGuardsCompare
601619
| 94 | x == 0+0 when CompareNE: ... != ... is false |
602620
| 102 | 10 < j+1 when CompareLT: ... < ... is false |
603621
| 102 | 10 >= j+1 when CompareLT: ... < ... is true |
622+
| 102 | j < 10 when CompareLT: ... < ... is true |
604623
| 102 | j < 10+0 when CompareLT: ... < ... is true |
624+
| 102 | j >= 10 when CompareLT: ... < ... is false |
605625
| 102 | j >= 10+0 when CompareLT: ... < ... is false |
606626
| 109 | 0 != x+0 when CompareEQ: ... == ... is false |
607627
| 109 | 0 < y+1 when CompareLT: ... < ... is false |
@@ -611,7 +631,9 @@ irGuardsCompare
611631
| 109 | x != 0+0 when CompareEQ: ... == ... is false |
612632
| 109 | x == 0 when CompareEQ: ... == ... is true |
613633
| 109 | x == 0+0 when CompareEQ: ... == ... is true |
634+
| 109 | y < 0 when CompareLT: ... < ... is true |
614635
| 109 | y < 0+0 when CompareLT: ... < ... is true |
636+
| 109 | y >= 0 when CompareLT: ... < ... is false |
615637
| 109 | y >= 0+0 when CompareLT: ... < ... is false |
616638
| 156 | ... + ... != x+0 when CompareEQ: ... == ... is false |
617639
| 156 | ... + ... == x+0 when CompareEQ: ... == ... is true |
@@ -906,8 +928,49 @@ irGuardsEnsure
906928
| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:12:31:13 | Constant: - ... | == | test.cpp:31:7:31:7 | Load: x | 0 | 30 | 30 |
907929
| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:12:31:13 | Constant: - ... | == | test.cpp:31:7:31:7 | Load: x | 0 | 32 | 32 |
908930
irGuardsEnsure_const
931+
| test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | < | 1 | 11 | 11 |
932+
| test.c:7:9:7:13 | CompareGT: ... > ... | test.c:7:9:7:9 | Load: x | >= | 1 | 8 | 8 |
933+
| test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:8 | Load: x | < | 0 | 17 | 17 |
934+
| test.c:17:8:17:12 | CompareLT: ... < ... | test.c:17:8:17:8 | Load: x | < | 0 | 18 | 18 |
935+
| test.c:17:17:17:21 | CompareGT: ... > ... | test.c:17:17:17:17 | Load: y | >= | 2 | 18 | 18 |
936+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 2 | 2 |
937+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 31 | 31 |
938+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 34 | 34 |
939+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 35 | 35 |
940+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 39 | 39 |
941+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 42 | 42 |
942+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 43 | 43 |
943+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 45 | 45 |
944+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 46 | 46 |
945+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 52 | 52 |
946+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 56 | 56 |
947+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 58 | 58 |
948+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 59 | 59 |
949+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | < | 1 | 62 | 62 |
950+
| test.c:26:11:26:15 | CompareGT: ... > ... | test.c:26:11:26:11 | Load: x | >= | 1 | 27 | 27 |
951+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | < | 10 | 35 | 35 |
952+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 2 | 2 |
953+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 39 | 39 |
954+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 42 | 42 |
955+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 43 | 43 |
956+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 45 | 45 |
957+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 46 | 46 |
958+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 52 | 52 |
959+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 56 | 56 |
960+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 58 | 58 |
961+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 59 | 59 |
962+
| test.c:34:16:34:21 | CompareLT: ... < ... | test.c:34:16:34:16 | Load: j | >= | 10 | 62 | 62 |
963+
| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 43 | 43 |
964+
| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 45 | 45 |
965+
| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 46 | 46 |
966+
| test.c:42:16:42:21 | CompareLT: ... < ... | test.c:42:16:42:16 | Load: j | < | 10 | 52 | 52 |
967+
| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | < | 1 | 52 | 52 |
968+
| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 45 | 45 |
969+
| test.c:44:12:44:16 | CompareGT: ... > ... | test.c:44:12:44:12 | Load: z | >= | 1 | 46 | 46 |
970+
| test.c:45:16:45:20 | CompareGT: ... > ... | test.c:45:16:45:16 | Load: y | >= | 1 | 46 | 46 |
909971
| test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 58 | 58 |
910972
| test.c:58:9:58:14 | CompareEQ: ... == ... | test.c:58:9:58:9 | Load: x | != | 0 | 62 | 62 |
973+
| test.c:58:19:58:23 | CompareLT: ... < ... | test.c:58:19:58:19 | Load: y | >= | 0 | 62 | 62 |
911974
| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | != | 0 | 79 | 79 |
912975
| test.c:75:9:75:14 | CompareEQ: ... == ... | test.c:75:9:75:9 | Load: x | == | 0 | 76 | 76 |
913976
| test.c:85:8:85:13 | CompareEQ: ... == ... | test.c:85:8:85:8 | Load: x | == | 0 | 85 | 85 |
@@ -922,8 +985,15 @@ irGuardsEnsure_const
922985
| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 109 | 109 |
923986
| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 110 | 110 |
924987
| test.c:94:11:94:16 | CompareNE: ... != ... | test.c:94:11:94:11 | Load: x | == | 0 | 113 | 113 |
988+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | < | 10 | 103 | 103 |
989+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 70 | 70 |
990+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 107 | 107 |
991+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 109 | 109 |
992+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 110 | 110 |
993+
| test.c:102:16:102:21 | CompareLT: ... < ... | test.c:102:16:102:16 | Load: j | >= | 10 | 113 | 113 |
925994
| test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:9 | Load: x | != | 0 | 109 | 109 |
926995
| test.c:109:9:109:14 | CompareEQ: ... == ... | test.c:109:9:109:9 | Load: x | != | 0 | 113 | 113 |
996+
| test.c:109:19:109:23 | CompareLT: ... < ... | test.c:109:19:109:19 | Load: y | >= | 0 | 113 | 113 |
927997
| test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:15 | Call: call to foo | != | 0 | 175 | 175 |
928998
| test.c:175:13:175:32 | CompareEQ: ... == ... | test.c:175:13:175:15 | Call: call to foo | == | 0 | 175 | 175 |
929999
| test.cpp:31:7:31:13 | CompareEQ: ... == ... | test.cpp:31:7:31:7 | Load: x | != | -1 | 34 | 34 |

0 commit comments

Comments
 (0)