Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
715605fa
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,发现更多精彩内容 >>
提交
715605fa
编写于
5月 02, 2015
作者:
L
Luqman Aden
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
librustc_trans: Handle DST structs in trans::_match.
上级
5574029b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
103 addition
and
2 deletion
+103
-2
src/librustc_trans/trans/_match.rs
src/librustc_trans/trans/_match.rs
+33
-2
src/test/run-pass/issue-23261.rs
src/test/run-pass/issue-23261.rs
+70
-0
未找到文件。
src/librustc_trans/trans/_match.rs
浏览文件 @
715605fa
...
@@ -210,6 +210,7 @@
...
@@ -210,6 +210,7 @@
use
trans
::
datum
::
*
;
use
trans
::
datum
::
*
;
use
trans
::
debuginfo
::{
self
,
DebugLoc
,
ToDebugLoc
};
use
trans
::
debuginfo
::{
self
,
DebugLoc
,
ToDebugLoc
};
use
trans
::
expr
::{
self
,
Dest
};
use
trans
::
expr
::{
self
,
Dest
};
use
trans
::
monomorphize
;
use
trans
::
tvec
;
use
trans
::
tvec
;
use
trans
::
type_of
;
use
trans
::
type_of
;
use
middle
::
ty
::{
self
,
Ty
};
use
middle
::
ty
::{
self
,
Ty
};
...
@@ -1076,9 +1077,39 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
...
@@ -1076,9 +1077,39 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
let
adt_vals
=
if
any_irrefutable_adt_pat
(
bcx
.tcx
(),
m
,
col
)
{
let
adt_vals
=
if
any_irrefutable_adt_pat
(
bcx
.tcx
(),
m
,
col
)
{
let
repr
=
adt
::
represent_type
(
bcx
.ccx
(),
left_ty
);
let
repr
=
adt
::
represent_type
(
bcx
.ccx
(),
left_ty
);
let
arg_count
=
adt
::
num_args
(
&*
repr
,
0
);
let
arg_count
=
adt
::
num_args
(
&*
repr
,
0
);
let
field_vals
:
Vec
<
ValueRef
>
=
(
0
..
arg_count
)
.map
(|
ix
|
let
(
arg_count
,
struct_val
)
=
if
type_is_sized
(
bcx
.tcx
(),
left_ty
)
{
adt
::
trans_field_ptr
(
bcx
,
&*
repr
,
val
,
0
,
ix
)
(
arg_count
,
val
)
}
else
{
// For an unsized ADT (i.e. DST struct), we need to treat
// the last field specially: instead of simply passing a
// ValueRef pointing to that field, as with all the others,
// we skip it and instead construct a 'fat ptr' below.
(
arg_count
-
1
,
Load
(
bcx
,
expr
::
get_dataptr
(
bcx
,
val
)))
};
let
mut
field_vals
:
Vec
<
ValueRef
>
=
(
0
..
arg_count
)
.map
(|
ix
|
adt
::
trans_field_ptr
(
bcx
,
&*
repr
,
struct_val
,
0
,
ix
)
)
.collect
();
)
.collect
();
match
left_ty
.sty
{
ty
::
ty_struct
(
def_id
,
substs
)
if
!
type_is_sized
(
bcx
.tcx
(),
left_ty
)
=>
{
// The last field is technically unsized but
// since we can only ever match that field behind
// a reference we construct a fat ptr here.
let
fields
=
ty
::
lookup_struct_fields
(
bcx
.tcx
(),
def_id
);
let
unsized_ty
=
fields
.iter
()
.last
()
.map
(|
field
|
{
let
fty
=
ty
::
lookup_field_type
(
bcx
.tcx
(),
def_id
,
field
.id
,
substs
);
monomorphize
::
normalize_associated_type
(
bcx
.tcx
(),
&
fty
)
})
.unwrap
();
let
llty
=
type_of
::
type_of
(
bcx
.ccx
(),
unsized_ty
);
let
scratch
=
alloca_no_lifetime
(
bcx
,
llty
,
"__struct_field_fat_ptr"
);
let
data
=
adt
::
trans_field_ptr
(
bcx
,
&*
repr
,
struct_val
,
0
,
arg_count
);
let
len
=
Load
(
bcx
,
expr
::
get_len
(
bcx
,
val
));
Store
(
bcx
,
data
,
expr
::
get_dataptr
(
bcx
,
scratch
));
Store
(
bcx
,
len
,
expr
::
get_len
(
bcx
,
scratch
));
field_vals
.push
(
scratch
);
}
_
=>
{}
}
Some
(
field_vals
)
Some
(
field_vals
)
}
else
if
any_uniq_pat
(
m
,
col
)
||
any_region_pat
(
m
,
col
)
{
}
else
if
any_uniq_pat
(
m
,
col
)
||
any_region_pat
(
m
,
col
)
{
Some
(
vec!
(
Load
(
bcx
,
val
)))
Some
(
vec!
(
Load
(
bcx
,
val
)))
...
...
src/test/run-pass/issue-23261.rs
0 → 100644
浏览文件 @
715605fa
// Copyright 2015 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.
// Matching on a DST struct should not trigger an LLVM assertion.
struct
Foo
<
T
:
?
Sized
>
{
a
:
i32
,
inner
:
T
}
trait
Get
{
fn
get
(
&
self
)
->
i32
;
}
impl
Get
for
i32
{
fn
get
(
&
self
)
->
i32
{
*
self
}
}
fn
check_val
(
val
:
&
Foo
<
[
u8
]
>
)
{
match
*
val
{
Foo
{
a
,
..
}
=>
{
assert_eq!
(
a
,
32
);
}
}
}
fn
check_dst_val
(
val
:
&
Foo
<
[
u8
]
>
)
{
match
*
val
{
Foo
{
ref
inner
,
..
}
=>
{
assert_eq!
(
inner
,
[
1
,
2
,
3
]);
}
}
}
fn
check_both
(
val
:
&
Foo
<
[
u8
]
>
)
{
match
*
val
{
Foo
{
a
,
ref
inner
}
=>
{
assert_eq!
(
a
,
32
);
assert_eq!
(
inner
,
[
1
,
2
,
3
]);
}
}
}
fn
check_trait_obj
(
val
:
&
Foo
<
Get
>
)
{
match
*
val
{
Foo
{
a
,
ref
inner
}
=>
{
assert_eq!
(
a
,
32
);
assert_eq!
(
inner
.get
(),
32
);
}
}
}
fn
main
()
{
let
foo
:
&
Foo
<
[
u8
]
>
=
&
Foo
{
a
:
32
,
inner
:
[
1
,
2
,
3
]
};
check_val
(
foo
);
check_dst_val
(
foo
);
check_both
(
foo
);
let
foo
:
&
Foo
<
Get
>
=
&
Foo
{
a
:
32
,
inner
:
32
};
check_trait_obj
(
foo
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录