Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
da33935c
R
Rust
项目概览
int
/
Rust
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
da33935c
编写于
1月 22, 2020
作者:
E
Eduard-Mihai Burtescu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rustc_target: treat enum variants like union members, in call ABIs.
上级
8f81593d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
9 deletion
+43
-9
src/librustc_target/abi/call/mod.rs
src/librustc_target/abi/call/mod.rs
+27
-1
src/librustc_target/abi/call/x86_64.rs
src/librustc_target/abi/call/x86_64.rs
+16
-8
未找到文件。
src/librustc_target/abi/call/mod.rs
浏览文件 @
da33935c
...
...
@@ -308,7 +308,7 @@ pub fn homogeneous_aggregate<C>(&self, cx: &C) -> Result<HomogeneousAggregate, H
Abi
::
ScalarPair
(
..
)
|
Abi
::
Aggregate
{
..
}
=>
{
// Helper for computing `homogenous_aggregate`, allowing a custom
// starting offset (
TODO(eddyb): use this to handle
variants).
// starting offset (
used below for handling
variants).
let
from_fields_at
=
|
layout
:
Self
,
start
:
Size
|
...
...
@@ -354,6 +354,32 @@ pub fn homogeneous_aggregate<C>(&self, cx: &C) -> Result<HomogeneousAggregate, H
let
(
mut
result
,
mut
total
)
=
from_fields_at
(
*
self
,
Size
::
ZERO
)
?
;
match
&
self
.variants
{
abi
::
Variants
::
Single
{
..
}
=>
{}
abi
::
Variants
::
Multiple
{
variants
,
..
}
=>
{
// Treat enum variants like union members.
// HACK(eddyb) pretend the `enum` field (discriminant)
// is at the start of every variant (otherwise the gap
// at the start of all variants would disqualify them).
//
// NB: for all tagged `enum`s (which include all non-C-like
// `enum`s with defined FFI representation), this will
// match the homogenous computation on the equivalent
// `struct { tag; union { variant1; ... } }` and/or
// `union { struct { tag; variant1; } ... }`
// (the offsets of variant fields should be identical
// between the two for either to be a homogenous aggregate).
let
variant_start
=
total
;
for
variant_idx
in
variants
.indices
()
{
let
(
variant_result
,
variant_total
)
=
from_fields_at
(
self
.for_variant
(
cx
,
variant_idx
),
variant_start
)
?
;
result
=
result
.merge
(
variant_result
)
?
;
total
=
total
.max
(
variant_total
);
}
}
}
// There needs to be no padding.
if
total
!=
self
.size
{
Err
(
Heterogeneous
)
...
...
src/librustc_target/abi/call/x86_64.rs
浏览文件 @
da33935c
...
...
@@ -56,16 +56,24 @@ fn classify<'a, Ty, C>(
Abi
::
Vector
{
..
}
=>
Class
::
Sse
,
Abi
::
ScalarPair
(
..
)
|
Abi
::
Aggregate
{
..
}
=>
match
layout
.variants
{
abi
::
Variants
::
Single
{
..
}
=>
{
for
i
in
0
..
layout
.fields
.count
()
{
let
field_off
=
off
+
layout
.fields
.offset
(
i
);
classify
(
cx
,
layout
.field
(
cx
,
i
),
cls
,
field_off
)
?
;
Abi
::
ScalarPair
(
..
)
|
Abi
::
Aggregate
{
..
}
=>
{
for
i
in
0
..
layout
.fields
.count
()
{
let
field_off
=
off
+
layout
.fields
.offset
(
i
);
classify
(
cx
,
layout
.field
(
cx
,
i
),
cls
,
field_off
)
?
;
}
match
&
layout
.variants
{
abi
::
Variants
::
Single
{
..
}
=>
{}
abi
::
Variants
::
Multiple
{
variants
,
..
}
=>
{
// Treat enum variants like union members.
for
variant_idx
in
variants
.indices
()
{
classify
(
cx
,
layout
.for_variant
(
cx
,
variant_idx
),
cls
,
off
)
?
;
}
}
return
Ok
(());
}
abi
::
Variants
::
Multiple
{
..
}
=>
return
Err
(
Memory
),
},
return
Ok
(());
}
};
// Fill in `cls` for scalars (Int/Sse) and vectors (Sse).
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录