Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
bb1ecee5
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,发现更多精彩内容 >>
提交
bb1ecee5
编写于
12月 14, 2019
作者:
O
Oliver Scherer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify `force_allocation_maybe_sized`
上级
b5b5258d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
15 deletion
+4
-15
src/librustc_mir/interpret/eval_context.rs
src/librustc_mir/interpret/eval_context.rs
+1
-1
src/librustc_mir/interpret/place.rs
src/librustc_mir/interpret/place.rs
+3
-14
未找到文件。
src/librustc_mir/interpret/eval_context.rs
浏览文件 @
bb1ecee5
...
...
@@ -118,7 +118,7 @@ pub struct LocalState<'tcx, Tag = (), Id = AllocId> {
}
/// Current value of a local variable
#[derive(Clone,
PartialEq,
Eq,
Debug,
HashStable)]
// Miri debug-prints these
#[derive(C
opy,
C
lone,
PartialEq,
Eq,
Debug,
HashStable)]
// Miri debug-prints these
pub
enum
LocalValue
<
Tag
=
(),
Id
=
AllocId
>
{
/// This local is not currently alive, and cannot be used at all.
Dead
,
...
...
src/librustc_mir/interpret/place.rs
浏览文件 @
bb1ecee5
...
...
@@ -974,31 +974,20 @@ pub fn force_allocation_maybe_sized(
let
(
mplace
,
size
)
=
match
place
.place
{
Place
::
Local
{
frame
,
local
}
=>
{
match
self
.stack
[
frame
]
.locals
[
local
]
.access_mut
()
?
{
Ok
(
local_val
)
=>
{
Ok
(
&
mut
local_val
)
=>
{
// We need to make an allocation.
// FIXME: Consider not doing anything for a ZST, and just returning
// a fake pointer? Are we even called for ZST?
// We cannot hold on to the reference `local_val` while allocating,
// but we can hold on to the value in there.
let
old_val
=
if
let
LocalValue
::
Live
(
Operand
::
Immediate
(
value
))
=
*
local_val
{
Some
(
value
)
}
else
{
None
};
// We need the layout of the local. We can NOT use the layout we got,
// that might e.g., be an inner field of a struct with `Scalar` layout,
// that has different alignment than the outer field.
// We also need to support unsized types, and hence cannot use `allocate`.
let
local_layout
=
self
.layout_of_local
(
&
self
.stack
[
frame
],
local
,
None
)
?
;
// We also need to support unsized types, and hence cannot use `allocate`.
let
(
size
,
align
)
=
self
.size_and_align_of
(
meta
,
local_layout
)
?
.expect
(
"Cannot allocate for non-dyn-sized type"
);
let
ptr
=
self
.memory
.allocate
(
size
,
align
,
MemoryKind
::
Stack
);
let
mplace
=
MemPlace
{
ptr
:
ptr
.into
(),
align
,
meta
};
if
let
Some
(
value
)
=
old
_val
{
if
let
LocalValue
::
Live
(
Operand
::
Immediate
(
value
))
=
local
_val
{
// Preserve old value.
// We don't have to validate as we can assume the local
// was already valid for its type.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录