Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
faf3bcd7
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
faf3bcd7
编写于
2月 20, 2015
作者:
F
Felix S. Klock II
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Accommodate simple cases of arith-overflow in `rustc` related crates.
上级
f0404c39
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
5 deletion
+7
-5
src/librustc_trans/trans/adt.rs
src/librustc_trans/trans/adt.rs
+4
-2
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+2
-2
src/libsyntax/ext/deriving/encodable.rs
src/libsyntax/ext/deriving/encodable.rs
+1
-1
未找到文件。
src/librustc_trans/trans/adt.rs
浏览文件 @
faf3bcd7
...
...
@@ -778,7 +778,9 @@ fn load_discr(bcx: Block, ity: IntType, ptr: ValueRef, min: Disr, max: Disr)
assert
!
(
bits
<=
64
);
let
bits
=
bits
as
uint
;
let
mask
=
(
-
1u64
>>
(
64
-
bits
))
as
Disr
;
if
(
max
+
1
)
&
mask
==
min
&
mask
{
// For a (max) discr of -1, max will be `-1 as usize`, which overflows.
// However, that is fine here (it would still represent the full range),
if
(
max
.wrapping_add
(
1
))
&
mask
==
min
&
mask
{
// i.e., if the range is everything. The lo==hi case would be
// rejected by the LLVM verifier (it would mean either an
// empty set, which is impossible, or the entire range of the
...
...
@@ -787,7 +789,7 @@ fn load_discr(bcx: Block, ity: IntType, ptr: ValueRef, min: Disr, max: Disr)
}
else
{
// llvm::ConstantRange can deal with ranges that wrap around,
// so an overflow on (max + 1) is fine.
LoadRangeAssert
(
bcx
,
ptr
,
min
,
(
max
+
1
),
/* signed: */
True
)
LoadRangeAssert
(
bcx
,
ptr
,
min
,
(
max
.wrapping_add
(
1
)
),
/* signed: */
True
)
}
}
...
...
src/librustc_typeck/astconv.rs
浏览文件 @
faf3bcd7
...
...
@@ -205,9 +205,9 @@ pub fn opt_ast_region_to_region<'tcx>(
if
len
==
2
&&
i
==
0
{
m
.push_str
(
" or "
);
}
else
if
i
==
len
-
2
{
}
else
if
i
+
2
==
len
{
m
.push_str
(
", or "
);
}
else
if
i
!=
len
-
1
{
}
else
if
i
+
1
!=
len
{
m
.push_str
(
", "
);
}
}
...
...
src/libsyntax/ext/deriving/encodable.rs
浏览文件 @
faf3bcd7
...
...
@@ -181,7 +181,6 @@ fn encodable_substructure(cx: &mut ExtCtxt, trait_span: Span,
Struct
(
ref
fields
)
=>
{
let
emit_struct_field
=
cx
.ident_of
(
"emit_struct_field"
);
let
mut
stmts
=
Vec
::
new
();
let
last
=
fields
.len
()
-
1
;
for
(
i
,
&
FieldInfo
{
name
,
ref
self_
,
...
...
@@ -204,6 +203,7 @@ fn encodable_substructure(cx: &mut ExtCtxt, trait_span: Span,
lambda
));
// last call doesn't need a try!
let
last
=
fields
.len
()
-
1
;
let
call
=
if
i
!=
last
{
cx
.expr_try
(
span
,
call
)
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录