Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
f5098620
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,发现更多精彩内容 >>
提交
f5098620
编写于
5月 20, 2020
作者:
D
Dylan MacKenzie
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bail out if new return place has different type than old
上级
856cd660
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
1 deletion
+12
-1
src/librustc_mir/transform/nrvo.rs
src/librustc_mir/transform/nrvo.rs
+12
-1
未找到文件。
src/librustc_mir/transform/nrvo.rs
浏览文件 @
f5098620
...
...
@@ -44,6 +44,18 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, src: MirSource<'tcx>, body: &mut mir::Body
}
};
// Sometimes, the return place is assigned a local of a different but coercable type, for
// example `&T` instead of `&mut T`. Overwriting the `LocalInfo` for the return place would
// result in it having an incorrect type. Although this doesn't seem to cause a problem in
// codegen, bail out anyways since it happens so rarely.
let
ret_ty
=
body
.local_decls
[
mir
::
RETURN_PLACE
]
.ty
;
let
assigned_ty
=
body
.local_decls
[
returned_local
]
.ty
;
if
ret_ty
!=
assigned_ty
{
debug!
(
"`{:?}` was eligible for NRVO but for type mismatch"
,
src
.def_id
());
debug!
(
"typeof(_0) != typeof({:?}); {:?} != {:?}"
,
returned_local
,
ret_ty
,
assigned_ty
);
return
;
}
debug!
(
"`{:?}` was eligible for NRVO, making {:?} the return place"
,
src
.def_id
(),
...
...
@@ -60,7 +72,6 @@ fn run_pass(&self, tcx: TyCtxt<'tcx>, src: MirSource<'tcx>, body: &mut mir::Body
// Overwrite the debuginfo of `_0` with that of the renamed local.
let
(
renamed_decl
,
ret_decl
)
=
body
.local_decls
.pick2_mut
(
returned_local
,
mir
::
RETURN_PLACE
);
debug_assert_eq!
(
ret_decl
.ty
,
renamed_decl
.ty
);
ret_decl
.clone_from
(
renamed_decl
);
// The return place is always mutable.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录