Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
277b4f03
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
277b4f03
编写于
3月 16, 2015
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix soundness hole when unsizing boxes.
上级
5f5ed622
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
61 addition
and
21 deletion
+61
-21
src/librustc/middle/expr_use_visitor.rs
src/librustc/middle/expr_use_visitor.rs
+15
-21
src/test/compile-fail/borrowck-consume-unsize-vec.rs
src/test/compile-fail/borrowck-consume-unsize-vec.rs
+22
-0
src/test/compile-fail/borrowck-consume-upcast-box.rs
src/test/compile-fail/borrowck-consume-upcast-box.rs
+24
-0
未找到文件。
src/librustc/middle/expr_use_visitor.rs
浏览文件 @
277b4f03
...
...
@@ -857,28 +857,13 @@ fn walk_autoref(&mut self,
n
:
uint
)
{
debug!
(
"walk_autoref expr={}"
,
expr
.repr
(
self
.tcx
()));
// Match for unique trait coercions first, since we don't need the
// call to cat_expr_autoderefd.
match
*
autoref
{
ty
::
AutoUnsizeUniq
(
ty
::
UnsizeVtable
(
..
))
|
ty
::
AutoUnsize
(
ty
::
UnsizeVtable
(
..
))
=>
{
assert
!
(
n
==
1
,
format!
(
"Expected exactly 1 deref with Uniq
\
AutoRefs, found: {}"
,
n
));
let
cmt_unadjusted
=
return_if_err!
(
self
.mc
.cat_expr_unadjusted
(
expr
));
self
.delegate_consume
(
expr
.id
,
expr
.span
,
cmt_unadjusted
);
return
;
}
_
=>
{}
}
let
cmt_derefd
=
return_if_err!
(
self
.mc
.cat_expr_autoderefd
(
expr
,
n
));
debug!
(
"walk_adjustment: cmt_derefd={}"
,
cmt_derefd
.repr
(
self
.tcx
()));
match
*
autoref
{
ty
::
AutoPtr
(
r
,
m
,
_
)
=>
{
let
cmt_derefd
=
return_if_err!
(
self
.mc
.cat_expr_autoderefd
(
expr
,
n
));
debug!
(
"walk_adjustment: cmt_derefd={}"
,
cmt_derefd
.repr
(
self
.tcx
()));
self
.delegate
.borrow
(
expr
.id
,
expr
.span
,
cmt_derefd
,
...
...
@@ -886,7 +871,16 @@ fn walk_autoref(&mut self,
ty
::
BorrowKind
::
from_mutbl
(
m
),
AutoRef
);
}
ty
::
AutoUnsizeUniq
(
_
)
|
ty
::
AutoUnsize
(
_
)
|
ty
::
AutoUnsafe
(
..
)
=>
{}
ty
::
AutoUnsize
(
_
)
|
ty
::
AutoUnsizeUniq
(
_
)
=>
{
assert
!
(
n
==
1
,
format!
(
"Expected exactly 1 deref with Uniq
\
AutoRefs, found: {}"
,
n
));
let
cmt_unadjusted
=
return_if_err!
(
self
.mc
.cat_expr_unadjusted
(
expr
));
self
.delegate_consume
(
expr
.id
,
expr
.span
,
cmt_unadjusted
);
}
ty
::
AutoUnsafe
(
..
)
=>
{
}
}
}
...
...
src/test/compile-fail/borrowck-consume-unsize-vec.rs
0 → 100644
浏览文件 @
277b4f03
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Check that we report an error if an upcast box is moved twice.
fn
consume
(
_
:
Box
<
[
i32
]
>
)
{
}
fn
foo
(
b
:
Box
<
[
i32
;
5
]
>
)
{
consume
(
b
);
consume
(
b
);
//~ ERROR use of moved value
}
fn
main
()
{
}
src/test/compile-fail/borrowck-consume-upcast-box.rs
0 → 100644
浏览文件 @
277b4f03
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Check that we report an error if an upcast box is moved twice.
trait
Foo
{
fn
dummy
(
&
self
);
}
fn
consume
(
_
:
Box
<
Foo
>
)
{
}
fn
foo
(
b
:
Box
<
Foo
+
Send
>
)
{
consume
(
b
);
consume
(
b
);
//~ ERROR use of moved value
}
fn
main
()
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录