Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
b2ec645d
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,发现更多精彩内容 >>
提交
b2ec645d
编写于
6月 19, 2020
作者:
D
Dylan MacKenzie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Incorporate review suggestions
Co-authored-by:
N
Tyler Mandry
<
tmandry@gmail.com
>
上级
c178e643
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
5 deletion
+8
-5
src/librustc_mir/transform/generator.rs
src/librustc_mir/transform/generator.rs
+8
-5
未找到文件。
src/librustc_mir/transform/generator.rs
浏览文件 @
b2ec645d
...
...
@@ -1343,7 +1343,7 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, source: MirSource<'tcx>, body: &mut Body<'
}
/// Looks for any assignments between locals (e.g., `_4 = _5`) that will both be converted to fields
/// in the generator state machine but whose storage
does not conflict.
/// in the generator state machine but whose storage
is not marked as conflicting
///
/// Validation needs to happen immediately *before* `TransformVisitor` is invoked, not after.
///
...
...
@@ -1371,7 +1371,7 @@ fn saved_local_for_direct_place(&self, place: Place<'_>) -> Option<GeneratorSave
fn
check_assigned_place
(
&
mut
self
,
place
:
Place
<
'tcx
>
,
f
:
impl
FnOnce
(
&
mut
Self
))
{
if
let
Some
(
assigned_local
)
=
self
.saved_local_for_direct_place
(
place
)
{
assert
!
(
self
.assigned_local
.is_none
(),
"`check_assigned_
local
` must not recurse"
);
assert
!
(
self
.assigned_local
.is_none
(),
"`check_assigned_
place
` must not recurse"
);
self
.assigned_local
=
Some
(
assigned_local
);
f
(
self
);
...
...
@@ -1385,7 +1385,10 @@ fn visit_place(&mut self, place: &Place<'tcx>, context: PlaceContext, location:
let
lhs
=
match
self
.assigned_local
{
Some
(
l
)
=>
l
,
None
=>
{
// We should be visiting all places used in the MIR.
// This visitor only invokes `visit_place` for the right-hand side of an assignment
// and only after setting `self.assigned_local`. However, the default impl of
// `Visitor::super_body` may call `visit_place` with a `NonUseContext` for places
// with debuginfo. Ignore them here.
assert
!
(
!
context
.is_use
());
return
;
}
...
...
@@ -1398,8 +1401,8 @@ fn visit_place(&mut self, place: &Place<'tcx>, context: PlaceContext, location:
if
!
self
.storage_conflicts
.contains
(
lhs
,
rhs
)
{
bug!
(
"Assignment between generator saved locals whose storage
does not conflict:
\
{:?}: {:?} = {:?}"
,
"Assignment between generator saved locals whose storage
is not
\
marked as conflicting:
{:?}: {:?} = {:?}"
,
location
,
lhs
,
rhs
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录