On second thought, don't generate virtual destructors

Author: DrChat

src/codegen/mod.rs

@@ -1041,19 +1041,19 @@ impl<'a> CodeGenerator for Vtable<'a> {
         assert_eq!(item.id(), self.item_id);
         debug_assert!(item.is_enabled_for_codegen(ctx));
         let name = ctx.rust_ident(&self.canonical_name(ctx));
-        let class_ident = ctx.rust_ident(self.item_id.canonical_name(ctx));
 
-        // For now, we will only generate vtables for classes that do not inherit from others.
-        if self.comp_info.base_members().is_empty() {
-            // Map the destructor into a Method, and chain it into the below iteration.
-            let dtor = self
-                .comp_info
-                .destructor()
-                .map(|(kind, id)| Method::new(kind, id, false));
+        // For now, we will only generate vtables for classes that:
+        // - do not inherit from others (compilers merge VTable from primary parent class).
+        // - do not contain a virtual destructor (requires ordering; platforms generate different vtables).
+        if self.comp_info.base_members().is_empty() &&
+            self.comp_info.destructor().is_none()
+        {
+            let class_ident = ctx.rust_ident(self.item_id.canonical_name(ctx));
 
-            let methods = dtor
+            let methods = self
+                .comp_info
+                .methods()
                 .iter()
-                .chain(self.comp_info.methods().iter())
                 .filter_map(|m| {
                     if !m.is_virtual() {
                         return None;

tests/expectations/tests/issue-1197-pure-virtual-stuff.rs

@@ -6,10 +6,7 @@
 )]
 
 #[repr(C)]
-pub struct Foo__bindgen_vtable {
-    pub Foo_Foo_destructor: fn(this: &mut Foo),
-    pub Foo_Bar: fn(this: &mut Foo),
-}
+pub struct Foo__bindgen_vtable(::std::os::raw::c_void);
 #[repr(C)]
 #[derive(Debug)]
 pub struct Foo {

tests/expectations/tests/packed-vtable.rs

@@ -7,9 +7,7 @@
 #![cfg(feature = "nightly")]
 
 #[repr(C)]
-pub struct PackedVtable__bindgen_vtable {
-    pub PackedVtable_PackedVtable_destructor: fn(this: &mut PackedVtable),
-}
+pub struct PackedVtable__bindgen_vtable(::std::os::raw::c_void);
 #[repr(C, packed)]
 #[derive(Debug)]
 pub struct PackedVtable {

tests/expectations/tests/virtual_dtor.rs

@@ -6,9 +6,7 @@
 )]
 
 #[repr(C)]
-pub struct nsSlots__bindgen_vtable {
-    pub nsSlots_nsSlots_destructor: fn(this: &mut nsSlots),
-}
+pub struct nsSlots__bindgen_vtable(::std::os::raw::c_void);
 #[repr(C)]
 #[derive(Debug)]
 pub struct nsSlots {