Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
8ad40479
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
8ad40479
编写于
8月 19, 2018
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
optimize creating a stack frame
上级
c3d392f5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
6 deletion
+17
-6
src/librustc/mir/interpret/value.rs
src/librustc/mir/interpret/value.rs
+2
-0
src/librustc_mir/interpret/eval_context.rs
src/librustc_mir/interpret/eval_context.rs
+15
-6
未找到文件。
src/librustc/mir/interpret/value.rs
浏览文件 @
8ad40479
...
...
@@ -178,6 +178,7 @@ pub fn to_bool(self) -> EvalResult<'tcx, bool> {
}
impl
From
<
Pointer
>
for
Scalar
{
#[inline(always)]
fn
from
(
ptr
:
Pointer
)
->
Self
{
Scalar
::
Ptr
(
ptr
)
}
...
...
@@ -210,6 +211,7 @@ pub enum ScalarMaybeUndef {
}
impl
From
<
Scalar
>
for
ScalarMaybeUndef
{
#[inline(always)]
fn
from
(
s
:
Scalar
)
->
Self
{
ScalarMaybeUndef
::
Scalar
(
s
)
}
...
...
src/librustc_mir/interpret/eval_context.rs
浏览文件 @
8ad40479
...
...
@@ -288,6 +288,7 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> LayoutOf for &'a EvalContext<'a, 'm
type
Ty
=
Ty
<
'tcx
>
;
type
TyLayout
=
EvalResult
<
'tcx
,
TyLayout
<
'tcx
>>
;
#[inline]
fn
layout_of
(
self
,
ty
:
Ty
<
'tcx
>
)
->
Self
::
TyLayout
{
self
.tcx
.layout_of
(
self
.param_env
.and
(
ty
))
.map_err
(|
layout
|
EvalErrorKind
::
Layout
(
layout
)
.into
())
...
...
@@ -559,7 +560,7 @@ pub fn push_stack_frame(
// value we use for things that we know are initially dead.
let
dummy
=
LocalValue
::
Live
(
Operand
::
Immediate
(
Value
::
Scalar
(
ScalarMaybeUndef
::
Undef
)));
self
.frame_mut
()
.
locals
=
IndexVec
::
from_elem
(
dummy
,
&
mir
.local_decls
);
let
mut
locals
=
IndexVec
::
from_elem
(
dummy
,
&
mir
.local_decls
);
// Now mark those locals as dead that we do not want to initialize
match
self
.tcx
.describe_def
(
instance
.def_id
())
{
// statics and constants don't have `Storage*` statements, no need to look for them
...
...
@@ -572,8 +573,7 @@ pub fn push_stack_frame(
match
stmt
.kind
{
StorageLive
(
local
)
|
StorageDead
(
local
)
=>
{
// Worst case we are overwriting a dummy, no deallocation needed
self
.storage_dead
(
local
);
locals
[
local
]
=
LocalValue
::
Dead
;
}
_
=>
{}
}
...
...
@@ -582,11 +582,20 @@ pub fn push_stack_frame(
},
}
// Finally, properly initialize all those that still have the dummy value
for
local
in
mir
.local_decls
.indices
()
{
if
self
.frame
()
.locals
[
local
]
==
dummy
{
self
.storage_live
(
local
)
?
;
for
(
local
,
decl
)
in
locals
.iter_mut
()
.zip
(
mir
.local_decls
.iter
())
{
match
*
local
{
LocalValue
::
Live
(
_
)
=>
{
// This needs to be peoperly initialized.
let
layout
=
self
.layout_of
(
self
.monomorphize
(
decl
.ty
,
instance
.substs
))
?
;
*
local
=
LocalValue
::
Live
(
self
.uninit_operand
(
layout
)
?
);
}
LocalValue
::
Dead
=>
{
// Nothing to do
}
}
}
// done
self
.frame_mut
()
.locals
=
locals
;
}
if
self
.stack
.len
()
>
self
.stack_limit
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录