Auto merge of rust-lang#692 - emilio:virtual-template-params, r=fitzgen

ir: Don't assume template instantiation argument with vtable implies vtable

Fixes rust-lang#691

Author: bors-servo

Cargo.lock

@@ -13,7 +13,7 @@ name = "bindgen"
 readme = "README.md"
 repository = "https://github.com/servo/rust-bindgen"
 documentation = "https://docs.rs/bindgen"
-version = "0.24.0"
+version = "0.24.1"
 build = "build.rs"
 
 exclude = [

Cargo.toml

@@ -279,8 +279,7 @@ impl TemplateInstantiation {
 
     /// Does this instantiation have a vtable?
     pub fn has_vtable(&self, ctx: &BindgenContext) -> bool {
-        ctx.resolve_type(self.definition).has_vtable(ctx) ||
-        self.args.iter().any(|arg| ctx.resolve_type(*arg).has_vtable(ctx))
+        ctx.resolve_type(self.definition).has_vtable(ctx)
     }
 
     /// Does this instantiation have a destructor?

src/ir/template.rs

@@ -0,0 +1,60 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+#[repr(C)]
+pub struct VirtualMethods__bindgen_vtable(::std::os::raw::c_void);
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct VirtualMethods {
+    pub vtable_: *const VirtualMethods__bindgen_vtable,
+}
+#[test]
+fn bindgen_test_layout_VirtualMethods() {
+    assert_eq!(::std::mem::size_of::<VirtualMethods>() , 8usize , concat ! (
+               "Size of: " , stringify ! ( VirtualMethods ) ));
+    assert_eq! (::std::mem::align_of::<VirtualMethods>() , 8usize , concat ! (
+                "Alignment of " , stringify ! ( VirtualMethods ) ));
+}
+impl Clone for VirtualMethods {
+    fn clone(&self) -> Self { *self }
+}
+impl Default for VirtualMethods {
+    fn default() -> Self { unsafe { ::std::mem::zeroed() } }
+}
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone)]
+pub struct Set {
+    pub bar: ::std::os::raw::c_int,
+}
+#[repr(C)]
+#[derive(Debug, Copy)]
+pub struct ServoElementSnapshotTable {
+    pub _base: Set,
+}
+#[test]
+fn bindgen_test_layout_ServoElementSnapshotTable() {
+    assert_eq!(::std::mem::size_of::<ServoElementSnapshotTable>() , 4usize ,
+               concat ! (
+               "Size of: " , stringify ! ( ServoElementSnapshotTable ) ));
+    assert_eq! (::std::mem::align_of::<ServoElementSnapshotTable>() , 4usize ,
+                concat ! (
+                "Alignment of " , stringify ! ( ServoElementSnapshotTable )
+                ));
+}
+impl Clone for ServoElementSnapshotTable {
+    fn clone(&self) -> Self { *self }
+}
+impl Default for ServoElementSnapshotTable {
+    fn default() -> Self { unsafe { ::std::mem::zeroed() } }
+}
+#[test]
+fn __bindgen_test_layout_Set_instantiation_13() {
+    assert_eq!(::std::mem::size_of::<Set>() , 4usize , concat ! (
+               "Size of template specialization: " , stringify ! ( Set ) ));
+    assert_eq!(::std::mem::align_of::<Set>() , 4usize , concat ! (
+               "Alignment of template specialization: " , stringify ! ( Set )
+               ));
+}

tests/expectations/tests/issue-691-template-parameter-virtual.rs

@@ -0,0 +1,12 @@
+class VirtualMethods {
+  virtual void foo();
+};
+
+template<typename K>
+class Set {
+  int bar;
+};
+
+class ServoElementSnapshotTable
+  : public Set<VirtualMethods>
+{};