Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
ff35eeb8
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,发现更多精彩内容 >>
提交
ff35eeb8
编写于
12月 10, 2014
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Recycle skolemization counts and add some comments.
上级
7be059ff
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
4 deletion
+27
-4
src/librustc/middle/infer/higher_ranked/mod.rs
src/librustc/middle/infer/higher_ranked/mod.rs
+3
-1
src/librustc/middle/infer/region_inference/mod.rs
src/librustc/middle/infer/region_inference/mod.rs
+24
-3
未找到文件。
src/librustc/middle/infer/higher_ranked/mod.rs
浏览文件 @
ff35eeb8
...
...
@@ -76,7 +76,9 @@ fn higher_ranked_sub<T>(&self, a: &T, b: &T) -> cres<'tcx, T>
// fresh concrete region.
let
(
b_prime
,
skol_map
)
=
{
replace_late_bound_regions
(
self
.tcx
(),
b
,
|
br
,
_
|
{
let
skol
=
self
.infcx
()
.region_vars
.new_skolemized
(
br
);
let
skol
=
self
.infcx
()
.region_vars
.new_skolemized
(
br
,
&
snapshot
.region_vars_snapshot
);
debug!
(
"Bound region {} skolemized to {}"
,
bound_region_to_string
(
self
.tcx
(),
""
,
false
,
br
),
skol
);
...
...
src/librustc/middle/infer/region_inference/mod.rs
浏览文件 @
ff35eeb8
...
...
@@ -226,7 +226,8 @@ pub struct RegionVarBindings<'a, 'tcx: 'a> {
#[deriving(Show)]
#[allow(missing_copy_implementations)]
pub
struct
RegionSnapshot
{
length
:
uint
length
:
uint
,
skolemization_count
:
uint
,
}
impl
<
'a
,
'tcx
>
RegionVarBindings
<
'a
,
'tcx
>
{
...
...
@@ -254,7 +255,7 @@ pub fn start_snapshot(&self) -> RegionSnapshot {
let
length
=
self
.undo_log
.borrow
()
.len
();
debug!
(
"RegionVarBindings: start_snapshot({})"
,
length
);
self
.undo_log
.borrow_mut
()
.push
(
OpenSnapshot
);
RegionSnapshot
{
length
:
length
}
RegionSnapshot
{
length
:
length
,
skolemization_count
:
self
.skolemization_count
.get
()
}
}
pub
fn
commit
(
&
self
,
snapshot
:
RegionSnapshot
)
{
...
...
@@ -268,6 +269,7 @@ pub fn commit(&self, snapshot: RegionSnapshot) {
}
else
{
(
*
undo_log
)[
snapshot
.length
]
=
CommitedSnapshot
;
}
self
.skolemization_count
.set
(
snapshot
.skolemization_count
);
}
pub
fn
rollback_to
(
&
self
,
snapshot
:
RegionSnapshot
)
{
...
...
@@ -306,6 +308,7 @@ pub fn rollback_to(&self, snapshot: RegionSnapshot) {
}
let
c
=
undo_log
.pop
()
.unwrap
();
assert
!
(
c
==
OpenSnapshot
);
self
.skolemization_count
.set
(
snapshot
.skolemization_count
);
}
pub
fn
num_vars
(
&
self
)
->
uint
{
...
...
@@ -324,7 +327,25 @@ pub fn new_region_var(&self, origin: RegionVariableOrigin<'tcx>) -> RegionVid {
return
vid
;
}
pub
fn
new_skolemized
(
&
self
,
br
:
ty
::
BoundRegion
)
->
Region
{
/// Creates a new skolemized region. Skolemized regions are fresh
/// regions used when performing higher-ranked computations. They
/// must be used in a very particular way and are never supposed
/// to "escape" out into error messages or the code at large.
///
/// The idea is to always create a snapshot. Skolemized regions
/// can be created in the context of this snapshot, but once the
/// snapshot is commited or rolled back, their numbers will be
/// recycled, so you must be finished with them. See the extensive
/// comments in `higher_ranked.rs` to see how it works (in
/// particular, the subtyping comparison).
///
/// The `snapshot` argument to this function is not really used;
/// it's just there to make it explicit which snapshot bounds the
/// skolemized region that results.
pub
fn
new_skolemized
(
&
self
,
br
:
ty
::
BoundRegion
,
snapshot
:
&
RegionSnapshot
)
->
Region
{
assert
!
(
self
.in_snapshot
());
assert
!
(
self
.undo_log
.borrow
()[
snapshot
.length
]
==
OpenSnapshot
);
let
sc
=
self
.skolemization_count
.get
();
self
.skolemization_count
.set
(
sc
+
1
);
ReInfer
(
ReSkolemized
(
sc
,
br
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录