Skip to content

ty: Use underlying layout of typedefs if available. #3453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilio merged 1 commit into from
Sep 6, 2026
+78 −0
Merged

ty: Use underlying layout of typedefs if available. #3453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions bindgen-tests/tests/expectations/tests/issue-3406.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions bindgen-tests/tests/headers/issue-3406.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,26 @@ struct __attribute__((aligned(16))) Inner {
char byte;
};

typedef int AlignedInt __attribute__((aligned(16)));
typedef AlignedInt NestedAlignedInt;

struct Outer {
int before;
struct Inner inner;
};

struct Outer2 {
int before;
AlignedInt one;
AlignedInt two;
};

struct Outer3 {
int before;
AlignedInt inner;
};

struct Outer4 {
int before;
NestedAlignedInt inner;
};
9 changes: 9 additions & 0 deletions bindgen/ir/ty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,15 @@ impl Type {

/// What is the layout of this type?
pub(crate) fn layout(&self, ctx: &BindgenContext) -> Option<Layout> {
if let TypeKind::Alias(inner) | TypeKind::ResolvedTypeRef(inner) =
self.kind
{
// HACK(emilio): Rust can't represent over-aligned typedefs, so prefer the inner type's
// layout if available, to get struct layout correct at least...
if let Some(l) = ctx.resolve_type(inner).layout(ctx) {
return Some(l);
}
}
self.layout.or_else(|| {
match self.kind {
TypeKind::Comp(ref ci) => ci.layout(ctx),
Expand Down
Loading