Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
78deacc2
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,发现更多精彩内容 >>
提交
78deacc2
编写于
11月 21, 2020
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make redundant StorageLive UB
上级
cc03ee67
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
23 deletion
+16
-23
compiler/rustc_mir/src/interpret/eval_context.rs
compiler/rustc_mir/src/interpret/eval_context.rs
+14
-19
compiler/rustc_mir/src/interpret/step.rs
compiler/rustc_mir/src/interpret/step.rs
+2
-4
未找到文件。
compiler/rustc_mir/src/interpret/eval_context.rs
浏览文件 @
78deacc2
...
...
@@ -840,36 +840,31 @@ pub(super) fn pop_stack_frame(&mut self, unwinding: bool) -> InterpResult<'tcx>
Ok
(())
}
/// Mark a storage as live, killing the previous content and returning it.
/// Remember to deallocate that!
pub
fn
storage_live
(
&
mut
self
,
local
:
mir
::
Local
,
)
->
InterpResult
<
'tcx
,
LocalValue
<
M
::
PointerTag
>>
{
/// Mark a storage as live, killing the previous content.
pub
fn
storage_live
(
&
mut
self
,
local
:
mir
::
Local
)
->
InterpResult
<
'tcx
>
{
assert
!
(
local
!=
mir
::
RETURN_PLACE
,
"Cannot make return place live"
);
trace!
(
"{:?} is now live"
,
local
);
let
local_val
=
LocalValue
::
Uninitialized
;
// StorageLive *always* kills the value that's currently stored.
// However, we do not error if the variable already is live;
// see <https://github.com/rust-lang/rust/issues/42371>.
Ok
(
mem
::
replace
(
&
mut
self
.frame_mut
()
.locals
[
local
]
.value
,
local_val
))
// StorageLive expects the local to be dead, and marks it live.
let
old
=
mem
::
replace
(
&
mut
self
.frame_mut
()
.locals
[
local
]
.value
,
local_val
);
if
!
matches!
(
old
,
LocalValue
::
Dead
)
{
throw_ub_format!
(
"StorageLive on a local that was already live"
);
}
Ok
(())
}
/// Returns the old value of the local.
/// Remember to deallocate that!
pub
fn
storage_dead
(
&
mut
self
,
local
:
mir
::
Local
)
->
LocalValue
<
M
::
PointerTag
>
{
pub
fn
storage_dead
(
&
mut
self
,
local
:
mir
::
Local
)
->
InterpResult
<
'tcx
>
{
assert
!
(
local
!=
mir
::
RETURN_PLACE
,
"Cannot make return place dead"
);
trace!
(
"{:?} is now dead"
,
local
);
mem
::
replace
(
&
mut
self
.frame_mut
()
.locals
[
local
]
.value
,
LocalValue
::
Dead
)
// It is entirely okay for this local to be already dead (at least that's how we currently generate MIR)
let
old
=
mem
::
replace
(
&
mut
self
.frame_mut
()
.locals
[
local
]
.value
,
LocalValue
::
Dead
);
self
.deallocate_local
(
old
)
?
;
Ok
(())
}
pub
(
super
)
fn
deallocate_local
(
&
mut
self
,
local
:
LocalValue
<
M
::
PointerTag
>
,
)
->
InterpResult
<
'tcx
>
{
// FIXME: should we tell the user that there was a local which was never written to?
fn
deallocate_local
(
&
mut
self
,
local
:
LocalValue
<
M
::
PointerTag
>
)
->
InterpResult
<
'tcx
>
{
if
let
LocalValue
::
Live
(
Operand
::
Indirect
(
MemPlace
{
ptr
,
..
}))
=
local
{
// All locals have a backing allocation, even if the allocation is empty
// due to the local having ZST type.
...
...
compiler/rustc_mir/src/interpret/step.rs
浏览文件 @
78deacc2
...
...
@@ -95,14 +95,12 @@ pub fn step(&mut self) -> InterpResult<'tcx, bool> {
// Mark locals as alive
StorageLive
(
local
)
=>
{
let
old_val
=
self
.storage_live
(
*
local
)
?
;
self
.deallocate_local
(
old_val
)
?
;
self
.storage_live
(
*
local
)
?
;
}
// Mark locals as dead
StorageDead
(
local
)
=>
{
let
old_val
=
self
.storage_dead
(
*
local
);
self
.deallocate_local
(
old_val
)
?
;
self
.storage_dead
(
*
local
)
?
;
}
// No dynamic semantics attached to `FakeRead`; MIR
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录