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

Fix layout with packed class that only has a vtable #1495

Merged
merged 1 commit into from
Jan 18, 2019
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
4 changes: 4 additions & 0 deletions src/ir/comp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,10 @@ impl CompInfo {
}) {
info!("Found a struct that was defined within `#pragma packed(...)`");
return true;
} else if self.has_own_virtual_method {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this really be an else condition?

Or should it be:

// ..
}

if self.has_own_virtual_method && parent_layout.align == 1 {
    return 1;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It passes either way, so I guess it doesn't really matter. A class without data members won't ever pass that first condition. I can reword it if you like.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that's fine, I was wondering if this would allow catching stuff where we don't know the layout of the members because libclang doesn't expose it, yet we know we have a vtable. Anyhow this is fine.

if parent_layout.align == 1 {
return true;
}
}
}

Expand Down
39 changes: 39 additions & 0 deletions tests/expectations/tests/packed-vtable.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* automatically generated by rust-bindgen */

#![allow(
dead_code,
non_snake_case,
non_camel_case_types,
non_upper_case_globals
)]
#![cfg(feature = "nightly")]

#[repr(C)]
pub struct PackedVtable__bindgen_vtable(::std::os::raw::c_void);
#[repr(C, packed)]
#[derive(Debug)]
pub struct PackedVtable {
pub vtable_: *const PackedVtable__bindgen_vtable,
}
#[test]
fn bindgen_test_layout_PackedVtable() {
assert_eq!(
::std::mem::size_of::<PackedVtable>(),
8usize,
concat!("Size of: ", stringify!(PackedVtable))
);
assert_eq!(
::std::mem::align_of::<PackedVtable>(),
1usize,
concat!("Alignment of ", stringify!(PackedVtable))
);
}
impl Default for PackedVtable {
fn default() -> Self {
unsafe { ::std::mem::zeroed() }
}
}
extern "C" {
#[link_name = "\u{1}_ZN12PackedVtableD1Ev"]
pub fn PackedVtable_PackedVtable_destructor(this: *mut PackedVtable);
}
10 changes: 10 additions & 0 deletions tests/headers/packed-vtable.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// bindgen-flags: --raw-line '#![cfg(feature = "nightly")]' --rust-target 1.33 -- -x c++ -std=c++11

#pragma pack(1)

// This should be packed.
struct PackedVtable {
virtual ~PackedVtable();
};

#pragma pack()