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

rollup merge of #17013 : rgawdzik/literal_int

Browse Source
This commit is contained in:
Alex Crichton 2014-09-09 07:38:03 -07:00
commit a0b3701a21
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/librustc/lint/builtin.rs
View File

@ -172,33 +172,24 @@ impl LintPass for TypeLimits {
ast::ExprLit(lit) => { ast::ExprLit(lit) => {
match ty::get(ty::expr_ty(cx.tcx, e)).sty { match ty::get(ty::expr_ty(cx.tcx, e)).sty {
ty::ty_int(t) => { ty::ty_int(t) => {
let int_type = if t == ast::TyI { match lit.node {
cx.sess().targ_cfg.int_type
} else { t };
let (min, max) = int_ty_range(int_type);
let mut lit_val: i64 = match lit.node {
ast::LitInt(v, ast::SignedIntLit(_, ast::Plus)) | ast::LitInt(v, ast::SignedIntLit(_, ast::Plus)) |
ast::LitInt(v, ast::UnsuffixedIntLit(ast::Plus)) => { ast::LitInt(v, ast::UnsuffixedIntLit(ast::Plus)) => {
if v > i64::MAX as u64{ let int_type = if t == ast::TyI {
cx.sess().targ_cfg.int_type
} else { t };
let (min, max) = int_ty_range(int_type);
let negative = self.negated_expr_id == e.id;
if (negative && v > (min.abs() as u64)) ||
(!negative && v > (max.abs() as u64)) {
cx.span_lint(TYPE_OVERFLOW, e.span, cx.span_lint(TYPE_OVERFLOW, e.span,
"literal out of range for its type"); "literal out of range for its type");
return; return;
} }
v as i64
}
ast::LitInt(v, ast::SignedIntLit(_, ast::Minus)) |
ast::LitInt(v, ast::UnsuffixedIntLit(ast::Minus)) => {
-(v as i64)
} }
_ => fail!() _ => fail!()
}; };
if self.negated_expr_id == e.id {
lit_val *= -1;
}
if lit_val < min || lit_val > max {
cx.span_lint(TYPE_OVERFLOW, e.span,
"literal out of range for its type");
}
}, },
ty::ty_uint(t) => { ty::ty_uint(t) => {
let uint_type = if t == ast::TyU { let uint_type = if t == ast::TyU {

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

@ -49,6 +49,7 @@ fn main() {
let x = -2147483649_i32; //~ error: literal out of range for its type let x = -2147483649_i32; //~ error: literal out of range for its type
let x = 9223372036854775808_i64; //~ error: literal out of range for its type let x = 9223372036854775808_i64; //~ error: literal out of range for its type
let x = -9223372036854775808_i64; // should be OK
let x = 18446744073709551615_i64; //~ error: literal out of range for its type let x = 18446744073709551615_i64; //~ error: literal out of range for its type
let x = -3.40282348e+38_f32; //~ error: literal out of range for its type let x = -3.40282348e+38_f32; //~ error: literal out of range for its type