Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
cedc428a
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
cedc428a
编写于
5月 07, 2022
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the layout of repr(align) enums
上级
54f79bab
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
203 addition
and
4 deletion
+203
-4
compiler/rustc_middle/src/ty/layout.rs
compiler/rustc_middle/src/ty/layout.rs
+3
-3
src/test/ui/aligned_enum_cast.rs
src/test/ui/aligned_enum_cast.rs
+9
-1
src/test/ui/layout/issue-96185-overaligned-enum.rs
src/test/ui/layout/issue-96185-overaligned-enum.rs
+19
-0
src/test/ui/layout/issue-96185-overaligned-enum.stderr
src/test/ui/layout/issue-96185-overaligned-enum.stderr
+172
-0
未找到文件。
compiler/rustc_middle/src/ty/layout.rs
浏览文件 @
cedc428a
...
...
@@ -1418,9 +1418,9 @@ fn layout_of_uncached(&self, ty: Ty<'tcx>) -> Result<Layout<'tcx>, LayoutError<'
if
layout_variants
.iter
()
.all
(|
v
|
v
.abi
.is_uninhabited
())
{
abi
=
Abi
::
Uninhabited
;
}
else
if
tag
.size
(
dl
)
==
size
||
variants
.iter
()
.all
(|
layout
|
layout
.is_empty
())
{
//
Without latter check aligned enums with custom discriminant value
s
//
Would result in ICE see the issue #92464 for more info
}
else
if
tag
.size
(
dl
)
==
size
{
//
Make sure we only use scalar layout when the enum is entirely it
s
//
own tag (i.e. it has no padding nor any non-ZST variant fields).
abi
=
Abi
::
Scalar
(
tag
);
}
else
{
// Try to use a ScalarPair for all tagged enums.
...
...
src/test/ui/aligned_enum_cast.rs
浏览文件 @
cedc428a
...
...
@@ -11,5 +11,13 @@ enum Aligned {
fn
main
()
{
let
aligned
=
Aligned
::
Zero
;
let
fo
=
aligned
as
u8
;
println!
(
"foo {}"
,
fo
);
println!
(
"foo {}"
,
fo
);
println!
(
"{}"
,
tou8
(
Aligned
::
Zero
));
}
#[inline(never)]
fn
tou8
(
al
:
Aligned
)
->
u8
{
// Cast behind a function call so ConstProp does not see it
// (so that we can test codegen).
al
as
u8
}
src/test/ui/layout/issue-96185-overaligned-enum.rs
0 → 100644
浏览文件 @
cedc428a
// normalize-stderr-test "pref: Align\([1-8] bytes\)" -> "pref: $$PREF_ALIGN"
#![crate_type
=
"lib"
]
#![feature(rustc_attrs)]
// This cannot use `Scalar` abi since there is padding.
#[rustc_layout(debug)]
#[repr(align(
8
))]
pub
enum
Aligned1
{
//~ ERROR: layout_of
Zero
=
0
,
One
=
1
,
}
// This should use `Scalar` abi.
#[rustc_layout(debug)]
#[repr(align(
1
))]
pub
enum
Aligned2
{
//~ ERROR: layout_of
Zero
=
0
,
One
=
1
,
}
src/test/ui/layout/issue-96185-overaligned-enum.stderr
0 → 100644
浏览文件 @
cedc428a
error: layout_of(Aligned1) = Layout {
fields: Arbitrary {
offsets: [
Size(0 bytes),
],
memory_index: [
0,
],
},
variants: Multiple {
tag: Initialized {
value: Int(
I8,
false,
),
valid_range: 0..=1,
},
tag_encoding: Direct,
tag_field: 0,
variants: [
Layout {
fields: Arbitrary {
offsets: [],
memory_index: [],
},
variants: Single {
index: 0,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align(8 bytes),
pref: $PREF_ALIGN,
},
size: Size(8 bytes),
},
Layout {
fields: Arbitrary {
offsets: [],
memory_index: [],
},
variants: Single {
index: 1,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align(8 bytes),
pref: $PREF_ALIGN,
},
size: Size(8 bytes),
},
],
},
abi: Aggregate {
sized: true,
},
largest_niche: Some(
Niche {
offset: Size(0 bytes),
value: Int(
I8,
false,
),
valid_range: 0..=1,
},
),
align: AbiAndPrefAlign {
abi: Align(8 bytes),
pref: $PREF_ALIGN,
},
size: Size(8 bytes),
}
--> $DIR/issue-96185-overaligned-enum.rs:8:1
|
LL | pub enum Aligned1 {
| ^^^^^^^^^^^^^^^^^
error: layout_of(Aligned2) = Layout {
fields: Arbitrary {
offsets: [
Size(0 bytes),
],
memory_index: [
0,
],
},
variants: Multiple {
tag: Initialized {
value: Int(
I8,
false,
),
valid_range: 0..=1,
},
tag_encoding: Direct,
tag_field: 0,
variants: [
Layout {
fields: Arbitrary {
offsets: [],
memory_index: [],
},
variants: Single {
index: 0,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size(1 bytes),
},
Layout {
fields: Arbitrary {
offsets: [],
memory_index: [],
},
variants: Single {
index: 1,
},
abi: Aggregate {
sized: true,
},
largest_niche: None,
align: AbiAndPrefAlign {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size(1 bytes),
},
],
},
abi: Scalar(
Initialized {
value: Int(
I8,
false,
),
valid_range: 0..=1,
},
),
largest_niche: Some(
Niche {
offset: Size(0 bytes),
value: Int(
I8,
false,
),
valid_range: 0..=1,
},
),
align: AbiAndPrefAlign {
abi: Align(1 bytes),
pref: $PREF_ALIGN,
},
size: Size(1 bytes),
}
--> $DIR/issue-96185-overaligned-enum.rs:16:1
|
LL | pub enum Aligned2 {
| ^^^^^^^^^^^^^^^^^
error: aborting due to 2 previous errors
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录