Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
69576fcd
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,发现更多精彩内容 >>
提交
69576fcd
编写于
10月 11, 2018
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make ENFORCE_VALIDITY a function
miri needs this extra flexibility
上级
3272c984
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
6 deletion
+10
-6
src/librustc_mir/const_eval.rs
src/librustc_mir/const_eval.rs
+5
-1
src/librustc_mir/interpret/eval_context.rs
src/librustc_mir/interpret/eval_context.rs
+1
-1
src/librustc_mir/interpret/machine.rs
src/librustc_mir/interpret/machine.rs
+1
-1
src/librustc_mir/interpret/place.rs
src/librustc_mir/interpret/place.rs
+3
-3
未找到文件。
src/librustc_mir/const_eval.rs
浏览文件 @
69576fcd
...
@@ -343,7 +343,11 @@ impl<'a, 'mir, 'tcx> interpret::Machine<'a, 'mir, 'tcx>
...
@@ -343,7 +343,11 @@ impl<'a, 'mir, 'tcx> interpret::Machine<'a, 'mir, 'tcx>
type
MemoryMap
=
FxHashMap
<
AllocId
,
(
MemoryKind
<!>
,
Allocation
<
()
>
)
>
;
type
MemoryMap
=
FxHashMap
<
AllocId
,
(
MemoryKind
<!>
,
Allocation
<
()
>
)
>
;
const
STATIC_KIND
:
Option
<!>
=
None
;
// no copying of statics allowed
const
STATIC_KIND
:
Option
<!>
=
None
;
// no copying of statics allowed
const
ENFORCE_VALIDITY
:
bool
=
false
;
// for now, we don't
#[inline(always)]
fn
enforce_validity
(
_
ecx
:
&
EvalContext
<
'a
,
'mir
,
'tcx
,
Self
>
)
->
bool
{
false
// for now, we don't enforce validity
}
fn
find_fn
(
fn
find_fn
(
ecx
:
&
mut
EvalContext
<
'a
,
'mir
,
'tcx
,
Self
>
,
ecx
:
&
mut
EvalContext
<
'a
,
'mir
,
'tcx
,
Self
>
,
...
...
src/librustc_mir/interpret/eval_context.rs
浏览文件 @
69576fcd
...
@@ -524,7 +524,7 @@ pub(super) fn pop_stack_frame(&mut self) -> EvalResult<'tcx> {
...
@@ -524,7 +524,7 @@ pub(super) fn pop_stack_frame(&mut self) -> EvalResult<'tcx> {
}
}
// Validate the return value.
// Validate the return value.
if
let
Some
(
return_place
)
=
frame
.return_place
{
if
let
Some
(
return_place
)
=
frame
.return_place
{
if
M
::
ENFORCE_VALIDITY
{
if
M
::
enforce_validity
(
self
)
{
// Data got changed, better make sure it matches the type!
// Data got changed, better make sure it matches the type!
// It is still possible that the return place held invalid data while
// It is still possible that the return place held invalid data while
// the function is running, but that's okay because nobody could have
// the function is running, but that's okay because nobody could have
...
...
src/librustc_mir/interpret/machine.rs
浏览文件 @
69576fcd
...
@@ -86,7 +86,7 @@ pub trait Machine<'a, 'mir, 'tcx>: Sized {
...
@@ -86,7 +86,7 @@ pub trait Machine<'a, 'mir, 'tcx>: Sized {
const
STATIC_KIND
:
Option
<
Self
::
MemoryKinds
>
;
const
STATIC_KIND
:
Option
<
Self
::
MemoryKinds
>
;
/// Whether to enforce the validity invariant
/// Whether to enforce the validity invariant
const
ENFORCE_VALIDITY
:
bool
;
fn
enforce_validity
(
ecx
:
&
EvalContext
<
'a
,
'mir
,
'tcx
,
Self
>
)
->
bool
;
/// Called before a basic block terminator is executed.
/// Called before a basic block terminator is executed.
/// You can use this to detect endlessly running programs.
/// You can use this to detect endlessly running programs.
...
...
src/librustc_mir/interpret/place.rs
浏览文件 @
69576fcd
...
@@ -607,7 +607,7 @@ pub fn write_value(
...
@@ -607,7 +607,7 @@ pub fn write_value(
)
->
EvalResult
<
'tcx
>
{
)
->
EvalResult
<
'tcx
>
{
self
.write_value_no_validate
(
src_val
,
dest
)
?
;
self
.write_value_no_validate
(
src_val
,
dest
)
?
;
if
M
::
ENFORCE_VALIDITY
{
if
M
::
enforce_validity
(
self
)
{
// Data got changed, better make sure it matches the type!
// Data got changed, better make sure it matches the type!
self
.validate_operand
(
self
.place_to_op
(
dest
)
?
,
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
self
.validate_operand
(
self
.place_to_op
(
dest
)
?
,
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
}
}
...
@@ -729,7 +729,7 @@ pub fn copy_op(
...
@@ -729,7 +729,7 @@ pub fn copy_op(
)
->
EvalResult
<
'tcx
>
{
)
->
EvalResult
<
'tcx
>
{
self
.copy_op_no_validate
(
src
,
dest
)
?
;
self
.copy_op_no_validate
(
src
,
dest
)
?
;
if
M
::
ENFORCE_VALIDITY
{
if
M
::
enforce_validity
(
self
)
{
// Data got changed, better make sure it matches the type!
// Data got changed, better make sure it matches the type!
self
.validate_operand
(
self
.place_to_op
(
dest
)
?
,
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
self
.validate_operand
(
self
.place_to_op
(
dest
)
?
,
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
}
}
...
@@ -807,7 +807,7 @@ pub fn copy_op_transmute(
...
@@ -807,7 +807,7 @@ pub fn copy_op_transmute(
PlaceTy
::
from
(
MPlaceTy
{
mplace
:
*
dest
,
layout
:
src
.layout
}),
PlaceTy
::
from
(
MPlaceTy
{
mplace
:
*
dest
,
layout
:
src
.layout
}),
)
?
;
)
?
;
if
M
::
ENFORCE_VALIDITY
{
if
M
::
enforce_validity
(
self
)
{
// Data got changed, better make sure it matches the type!
// Data got changed, better make sure it matches the type!
self
.validate_operand
(
dest
.into
(),
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
self
.validate_operand
(
dest
.into
(),
&
mut
vec!
[],
None
,
/*const_mode*/
false
)
?
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录