Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
73d7f1d4
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,发现更多精彩内容 >>
未验证
提交
73d7f1d4
编写于
11月 04, 2016
作者:
O
Oliver Schneider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
implement drop for NonZero optimized enums
上级
ff95efc5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
0 deletion
+60
-0
src/interpreter/terminator/mod.rs
src/interpreter/terminator/mod.rs
+15
-0
tests/run-pass/regions-lifetime-nonfree-late-bound.rs
tests/run-pass/regions-lifetime-nonfree-late-bound.rs
+45
-0
未找到文件。
src/interpreter/terminator/mod.rs
浏览文件 @
73d7f1d4
...
...
@@ -560,6 +560,21 @@ fn drop(
return
Ok
(());
// nothing to do, this is zero sized (e.g. `None`)
}
},
Layout
::
RawNullablePointer
{
nndiscr
,
..
}
=>
{
let
discr
=
self
.read_discriminant_value
(
adt_ptr
,
ty
)
?
;
if
discr
==
nndiscr
{
assert_eq!
(
adt_def
.variants
[
discr
as
usize
]
.fields
.len
(),
1
);
let
field_ty
=
&
adt_def
.variants
[
discr
as
usize
]
.fields
[
0
];
let
field_ty
=
self
.monomorphize_field_ty
(
field_ty
,
substs
);
// FIXME: once read_discriminant_value works with lvalue, don't force
// alloc in the RawNullablePointer case
self
.drop
(
Lvalue
::
from_ptr
(
adt_ptr
),
field_ty
,
drop
)
?
;
return
Ok
(());
}
else
{
// FIXME: the zst variant might contain zst types that impl Drop
return
Ok
(());
// nothing to do, this is zero sized (e.g. `None`)
}
},
_
=>
bug!
(
"{:?} is not an adt layout"
,
layout
),
};
for
(
field_ty
,
offset
)
in
fields
{
...
...
tests/run-pass/regions-lifetime-nonfree-late-bound.rs
0 → 100644
浏览文件 @
73d7f1d4
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// This is a regression test for the ICE from issue #10846.
//
// The original issue causing the ICE: the LUB-computations during
// type inference were encountering late-bound lifetimes, and
// asserting that such lifetimes should have already been substituted
// with a concrete lifetime.
//
// However, those encounters were occurring within the lexical scope
// of the binding for the late-bound lifetime; that is, the late-bound
// lifetimes were perfectly valid. The core problem was that the type
// folding code was over-zealously passing back all lifetimes when
// doing region-folding, when really all clients of the region-folding
// case only want to see FREE lifetime variables, not bound ones.
// pretty-expanded FIXME #23616
#![allow(unused_features)]
#![feature(box_syntax)]
pub
fn
main
()
{
fn
explicit
()
{
fn
test
<
F
>
(
_
x
:
Option
<
Box
<
F
>>
)
where
F
:
FnMut
(
Box
<
for
<
'a
>
FnMut
(
&
'a
isize
)
>
)
{}
test
(
Some
(
box
|
_
f
:
Box
<
for
<
'a
>
FnMut
(
&
'a
isize
)
>
|
{}));
}
// The code below is shorthand for the code above (and more likely
// to represent what one encounters in practice).
fn
implicit
()
{
fn
test
<
F
>
(
_
x
:
Option
<
Box
<
F
>>
)
where
F
:
FnMut
(
Box
<
FnMut
(
&
isize
)
>
)
{}
test
(
Some
(
box
|
_
f
:
Box
<
FnMut
(
&
isize
)
>
|
{}));
}
explicit
();
implicit
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录