OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fix regression of literal out of range check for negative i64 values which was introduced by commit 7b1916d253.

Browse Source 
- Add missing test cases to test/compile-fail/lint-type-overflow.rs which would have detected the regression.
This commit is contained in:
econoplas 2015-05-25 07:42:16 -06:00
parent 2bc0bf2586
commit 43502adf07
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc_lint/builtin.rs
View File

@ -203,10 +203,12 @@ impl LintPass for TypeLimits {
} else {
t
};
let (min, max) = int_ty_range(int_type);
let (_, max) = int_ty_range(int_type);
let negative = self.negated_expr_id == e.id;
if (negative && min != i64::MIN && v > -min as u64) ||
// Detect literal value out of range [min, max] inclusive
// avoiding use of -min to prevent overflow/panic
if (negative && v > max as u64 + 1) ||
(!negative && v > max as u64) {
cx.span_lint(OVERFLOWING_LITERALS, e.span,
&*format!("literal out of range for {:?}", t));

2
src/test/compile-fail/lint-type-overflow.rs
View File

@ -52,6 +52,8 @@ fn main() {
let x = 9223372036854775808_i64; //~ error: literal out of range for i64
let x = -9223372036854775808_i64; // should be OK
let x = 18446744073709551615_i64; //~ error: literal out of range for i64
let x: i64 = -9223372036854775809; //~ error: literal out of range for i64
let x = -9223372036854775809_i64; //~ error: literal out of range for i64
let x = -3.40282348e+38_f32; //~ error: literal out of range for f32
let x = 3.40282348e+38_f32; //~ error: literal out of range for f32