Skip to content
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.

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

Avoid case of a self-referential type alias. #2109

Merged
merged 1 commit into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion src/ir/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,16 @@ impl Type {
let inner = cursor.typedef_type().expect("Not valid Type?");
let inner =
Item::from_ty_or_ref(inner, location, None, ctx);
TypeKind::Alias(inner)
if inner == potential_id {
warn!(
"Generating oqaque type instead of self-referential \
typedef");
// This can happen if we bail out of recursive situations
// within the clang parsing.
TypeKind::Opaque
} else {
TypeKind::Alias(inner)
}
}
CXType_Enum => {
let enum_ = Enum::from_ty(ty, ctx).expect("Not an enum?");
Expand Down
54 changes: 54 additions & 0 deletions tests/expectations/tests/constified-enum-module-overflow.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#![allow(
dead_code,
non_snake_case,
non_camel_case_types,
non_upper_case_globals
)]

#[repr(C)]
#[derive(Debug, Default, Copy, Clone)]
pub struct B {
pub _address: u8,
}
#[repr(C)]
#[derive(Debug, Default, Copy, Clone)]
pub struct C {
pub _address: u8,
}
pub type C_U = B;
#[repr(C)]
#[derive(Debug, Default, Copy, Clone)]
pub struct A {
pub u: u8,
}
#[test]
fn bindgen_test_layout_A() {
assert_eq!(
::std::mem::size_of::<A>(),
1usize,
concat!("Size of: ", stringify!(A))
);
assert_eq!(
::std::mem::align_of::<A>(),
1usize,
concat!("Alignment of ", stringify!(A))
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<A>())).u as *const _ as usize },
0usize,
concat!("Offset of field: ", stringify!(A), "::", stringify!(u))
);
}
#[test]
fn __bindgen_test_layout_C_open0_A_close0_instantiation() {
assert_eq!(
::std::mem::size_of::<C>(),
1usize,
concat!("Size of template specialization: ", stringify!(C))
);
assert_eq!(
::std::mem::align_of::<C>(),
1usize,
concat!("Alignment of template specialization: ", stringify!(C))
);
}
8 changes: 8 additions & 0 deletions tests/headers/constified-enum-module-overflow.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
template <typename> class B{};
template <typename c> class C {
public:
using U = B<c>;
};
class A : C<A> {
U u;
};