Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-15 14:43:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16285 - lnicola:repr-packed-unaligned, r=Veykril

Browse source 
fix: Fix panic on unaligned packed attribute

Closes #16284
This commit is contained in:
bors 2024-01-06 20:35:56 +00:00
commit e9ae0b7ab4
2 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/hir-def/src/data/adt.rs
View file

@ -128,7 +128,7 @@ fn parse_repr_tt(tt: &Subtree) -> Option<ReprOptions> {
} else { } else {
0 0
}; };
let pack = Align::from_bytes(pack).unwrap(); let pack = Align::from_bytes(pack).unwrap_or(Align::ONE);
min_pack = min_pack =
Some(if let Some(min_pack) = min_pack { min_pack.min(pack) } else { pack }); Some(if let Some(min_pack) = min_pack { min_pack.min(pack) } else { pack });
ReprFlags::empty() ReprFlags::empty()

30
crates/hir-ty/src/layout/tests.rs
View file

@ -220,6 +220,36 @@ fn recursive() {
); );
} }
#[test]
fn repr_packed() {
size_and_align! {
#[repr(packed)]
struct Goal;
}
size_and_align! {
#[repr(packed(2))]
struct Goal;
}
size_and_align! {
#[repr(packed(4))]
struct Goal;
}
size_and_align! {
#[repr(packed)]
struct Goal(i32);
}
size_and_align! {
#[repr(packed(2))]
struct Goal(i32);
}
size_and_align! {
#[repr(packed(4))]
struct Goal(i32);
}
check_size_and_align("#[repr(packed(5))] struct Goal(i32);", "", 4, 1);
}
#[test] #[test]
fn generic() { fn generic() {
size_and_align! { size_and_align! {