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

Skip to content

Commit 83884c0

Browse files
jbjjbj
authored
Merge pull request #4089 from jbj/jbj/printFloat-precise
C++: Accept float.toString changes in tests
2 parents 3e8f62f + 2e2f99c commit 83884c0

4 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/lowerBound.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
| test.c:150:25:150:26 | x3 | -2147483648 |
9999
| test.c:150:30:150:31 | c0 | -128 |
100100
| test.c:150:35:150:36 | s0 | 0 |
101-
| test.c:154:11:154:11 | x | -9223372036854776000 |
101+
| test.c:154:11:154:11 | x | -9223372036854775808 |
102102
| test.c:154:20:154:20 | x | 1 |
103103
| test.c:154:30:154:30 | x | 1 |
104104
| test.c:154:35:154:35 | x | 1 |
@@ -492,7 +492,7 @@
492492
| test.c:478:3:478:4 | xy | 0 |
493493
| test.c:478:8:478:8 | x | 274177 |
494494
| test.c:478:12:478:12 | y | 67280421310721 |
495-
| test.c:479:10:479:11 | xy | 18446744073709552000 |
495+
| test.c:479:10:479:11 | xy | 18446744073709551616 |
496496
| test.c:483:7:483:8 | ui | 0 |
497497
| test.c:484:43:484:44 | ui | 10 |
498498
| test.c:484:48:484:49 | ui | 10 |

‎cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/test.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,13 +476,13 @@ unsigned long mult_overflow() {
476476
x = 274177UL;
477477
y = 67280421310721UL;
478478
xy = x * y;
479-
return xy; // BUG: lower bound should be <= 18446744073709551617UL
479+
return xy; // BUG: upper bound should be >= 18446744073709551617UL
480480
}
481481

482482
unsigned long mult_lower_bound(unsigned int ui, unsigned long ul) {
483483
if (ui >= 10) {
484484
unsigned long result = (unsigned long)ui * ui;
485-
return result; // BUG: upper bound should be >= 18446744065119617025 (possibly a pretty-printing bug)
485+
return result; // BUG: upper bound should be >= 18446744065119617025
486486
}
487487
if (ul >= 10) {
488488
unsigned long result = ul * ul;

‎cpp/ql/test/library-tests/rangeanalysis/SimpleRangeAnalysis/upperBound.expected‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@
7373
| test.c:105:5:105:5 | c | 127 |
7474
| test.c:106:9:106:9 | c | 127 |
7575
| test.c:109:9:109:9 | c | 127 |
76-
| test.c:119:10:119:10 | n | 18446744073709552000 |
77-
| test.c:124:11:124:15 | Start | 18446744073709552000 |
78-
| test.c:127:6:127:10 | Start | 18446744073709552000 |
79-
| test.c:127:15:127:20 | Length | 18446744073709552000 |
76+
| test.c:119:10:119:10 | n | 18446744073709551616 |
77+
| test.c:124:11:124:15 | Start | 18446744073709551616 |
78+
| test.c:127:6:127:10 | Start | 18446744073709551616 |
79+
| test.c:127:15:127:20 | Length | 18446744073709551616 |
8080
| test.c:135:22:135:22 | c | 127 |
8181
| test.c:137:20:137:20 | x | 0 |
8282
| test.c:138:11:138:11 | i | 2147483647 |
@@ -98,9 +98,9 @@
9898
| test.c:150:25:150:26 | x3 | 2147483647 |
9999
| test.c:150:30:150:31 | c0 | 127 |
100100
| test.c:150:35:150:36 | s0 | 65535 |
101-
| test.c:154:11:154:11 | x | 9223372036854776000 |
102-
| test.c:154:20:154:20 | x | 9223372036854776000 |
103-
| test.c:154:30:154:30 | x | 9223372036854776000 |
101+
| test.c:154:11:154:11 | x | 9223372036854775808 |
102+
| test.c:154:20:154:20 | x | 9223372036854775808 |
103+
| test.c:154:30:154:30 | x | 9223372036854775808 |
104104
| test.c:154:35:154:35 | x | 2147483647 |
105105
| test.c:161:12:161:12 | a | 2147483647 |
106106
| test.c:161:17:161:17 | a | 2147483647 |
@@ -481,26 +481,26 @@
481481
| test.c:461:5:461:9 | total | 506 |
482482
| test.c:461:14:461:14 | r | 253 |
483483
| test.c:464:10:464:14 | total | 759 |
484-
| test.c:469:3:469:3 | x | 18446744073709552000 |
485-
| test.c:469:7:469:7 | y | 18446744073709552000 |
486-
| test.c:470:3:470:4 | xy | 18446744073709552000 |
484+
| test.c:469:3:469:3 | x | 18446744073709551616 |
485+
| test.c:469:7:469:7 | y | 18446744073709551616 |
486+
| test.c:470:3:470:4 | xy | 18446744073709551616 |
487487
| test.c:470:8:470:8 | x | 1000000003 |
488488
| test.c:470:12:470:12 | y | 1000000003 |
489489
| test.c:471:10:471:11 | xy | 1000000006000000000 |
490-
| test.c:476:3:476:3 | x | 18446744073709552000 |
491-
| test.c:477:3:477:3 | y | 18446744073709552000 |
492-
| test.c:478:3:478:4 | xy | 18446744073709552000 |
490+
| test.c:476:3:476:3 | x | 18446744073709551616 |
491+
| test.c:477:3:477:3 | y | 18446744073709551616 |
492+
| test.c:478:3:478:4 | xy | 18446744073709551616 |
493493
| test.c:478:8:478:8 | x | 274177 |
494494
| test.c:478:12:478:12 | y | 67280421310721 |
495-
| test.c:479:10:479:11 | xy | 18446744073709552000 |
495+
| test.c:479:10:479:11 | xy | 18446744073709551616 |
496496
| test.c:483:7:483:8 | ui | 4294967295 |
497497
| test.c:484:43:484:44 | ui | 4294967295 |
498498
| test.c:484:48:484:49 | ui | 4294967295 |
499-
| test.c:485:12:485:17 | result | 18446744065119617000 |
500-
| test.c:487:7:487:8 | ul | 18446744073709552000 |
501-
| test.c:488:28:488:29 | ul | 18446744073709552000 |
502-
| test.c:488:33:488:34 | ul | 18446744073709552000 |
503-
| test.c:489:12:489:17 | result | 18446744073709552000 |
499+
| test.c:485:12:485:17 | result | 18446744065119617024 |
500+
| test.c:487:7:487:8 | ul | 18446744073709551616 |
501+
| test.c:488:28:488:29 | ul | 18446744073709551616 |
502+
| test.c:488:33:488:34 | ul | 18446744073709551616 |
503+
| test.c:489:12:489:17 | result | 18446744073709551616 |
504504
| test.cpp:10:7:10:7 | b | 2147483647 |
505505
| test.cpp:11:5:11:5 | x | 2147483647 |
506506
| test.cpp:13:10:13:10 | x | 2147483647 |

‎cpp/ql/test/query-tests/Likely Bugs/Arithmetic/PointlessComparison/PointlessComparison.expected‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
| PointlessComparison.c:383:6:383:17 | ... >= ... | Comparison is always false because ... & ... <= 2. |
4444
| PointlessComparison.c:388:10:388:21 | ... > ... | Comparison is always false because ... * ... <= 408. |
4545
| PointlessComparison.c:391:12:391:20 | ... < ... | Comparison is always false because ... * ... >= 6. |
46-
| PointlessComparison.c:414:7:414:16 | ... == ... | Comparison is always false because ... * ... >= 18446744073709552000. |
47-
| PointlessComparison.cpp:36:6:36:33 | ... >= ... | Comparison is always false because ... >> ... <= 9223372036854776000. |
46+
| PointlessComparison.c:414:7:414:16 | ... == ... | Comparison is always false because ... * ... >= 18446744073709551616. |
47+
| PointlessComparison.cpp:36:6:36:33 | ... >= ... | Comparison is always false because ... >> ... <= 9223372036854775808. |
4848
| PointlessComparison.cpp:41:6:41:29 | ... >= ... | Comparison is always false because ... >> ... <= 140737488355327.5. |
4949
| PointlessComparison.cpp:42:6:42:29 | ... >= ... | Comparison is always false because ... >> ... <= 140737488355327.5. |
5050
| PointlessComparison.cpp:43:6:43:29 | ... >= ... | Comparison is always true because ... >> ... >= 140737488355327.5. |

0 commit comments

Comments
 (0)