Auto merge of #383 - emilio:virtual-base, r=fitzgen

Tidy up and test virtual inheritance handling.

Done while investigating #380.

r? @fitzgen

1 files changed, 13 insertions, 9 deletions

diff --git a/libbindgen/src/codegen/mod.rs b/libbindgen/src/codegen/mod.rs
index 24b862be..c6d5fd39 100644
--- a/libbindgen/src/codegen/mod.rs
+++ b/libbindgen/src/codegen/mod.rs
@@ -4,7 +4,7 @@ mod helpers;
 use aster;
 
 use ir::annotations::FieldAccessorKind;
-use ir::comp::{CompInfo, CompKind, Field, Method, MethodKind};
+use ir::comp::{Base, CompInfo, CompKind, Field, Method, MethodKind};
 use ir::context::{BindgenContext, ItemId};
 use ir::derive::{CanDeriveCopy, CanDeriveDebug};
 use ir::enum_ty::{Enum, EnumVariant, EnumVariantValue};
@@ -556,13 +556,13 @@ struct Vtable<'a> {
     #[allow(dead_code)]
     methods: &'a [Method],
     #[allow(dead_code)]
-    base_classes: &'a [ItemId],
+    base_classes: &'a [Base],
 }
 
 impl<'a> Vtable<'a> {
     fn new(item_id: ItemId,
            methods: &'a [Method],
-           base_classes: &'a [ItemId])
+           base_classes: &'a [Base])
            -> Self {
         Vtable {
             item_id: item_id,
@@ -835,14 +835,18 @@ impl CodeGenerator for CompInfo {
         }
 
         for (i, base) in self.base_members().iter().enumerate() {
-            let base_ty = ctx.resolve_type(*base);
+            // Virtual bases are already taken into account by the vtable
+            // pointer.
+            //
+            // FIXME(emilio): Is this always right?
+            if base.is_virtual() {
+                continue;
+            }
+
+            let base_ty = ctx.resolve_type(base.ty);
             // NB: We won't include unsized types in our base chain because they
             // would contribute to our size given the dummy field we insert for
             // unsized types.
-            //
-            // NB: Canonical type is here because it could be inheriting from a
-            // typedef, for example, and the lack of `unwrap()` is because we
-            // can inherit from a template parameter, yes.
             if base_ty.is_unsized(ctx) {
                 continue;
             }
@@ -854,7 +858,7 @@ impl CodeGenerator for CompInfo {
                 }
             }
 
-            let inner = base.to_rust_ty(ctx);
+            let inner = base.ty.to_rust_ty(ctx);
             let field_name = if i == 0 {
                 "_base".into()
             } else {