Struct detection works better now

Author: nikhilshagri

libbindgen/src/clang.rs

@@ -190,6 +190,10 @@ impl Cursor {
         unsafe { clang_getCursorKind(self.x) }
     }
 
+    pub fn is_definition(&self) -> bool {
+        unsafe { clang_isCursorDefinition(self.x) == 0 }
+    }
+
     /// Is the referent an anonymous record definition?
     pub fn is_anonymous(&self) -> bool {
         unsafe { clang_Cursor_isAnonymous(self.x) != 0 }

libbindgen/src/codegen/mod.rs

@@ -724,7 +724,7 @@ impl CodeGenerator for CompInfo {
         }
 
         // generate an opaque enum if struct is a forward declaration
-        if self.kind() == CompKind::Struct && self.is_declaration() {
+        if self.kind() == CompKind::Struct && self.is_forward_declaration() {
             let name = item.canonical_name(ctx);
             let builder = EnumBuilder::new(
                                   aster::AstBuilder::new().item().pub_(),

libbindgen/src/ir/comp.rs

@@ -237,7 +237,10 @@ pub struct CompInfo {
     /// around the template arguments.
     detect_has_destructor_cycle: Cell<bool>,
 
-    is_declaration: bool,
+    /// Used to indicate when a struct has been forward declared. Usually used
+    /// in headers so that APIs can't modify them directly.
+    /// e.g: struct forward_declared_struct;
+    is_forward_declaration: bool,
 }
 
 impl CompInfo {
@@ -262,7 +265,7 @@ impl CompInfo {
             found_unknown_attr: false,
             detect_derive_debug_cycle: Cell::new(false),
             detect_has_destructor_cycle: Cell::new(false),
-            is_declaration: false,
+            is_forward_declaration: false,
         }
     }
 
@@ -509,7 +512,8 @@ impl CompInfo {
         debug!("CompInfo::from_ty({:?}, {:?})", kind, cursor);
 
         let mut ci = CompInfo::new(kind);
-        ci.is_declaration = cursor.definition().unwrap().is_declaration();
+        ci.is_forward_declaration = location.map_or(true, |cur|
+                                        cur.is_definition() && cur.kind() == CXCursor_StructDecl);
         ci.is_anonymous = cursor.is_anonymous();
         ci.template_args = match ty.template_args() {
             // In forward declarations and not specializations,
@@ -861,8 +865,8 @@ impl CompInfo {
         })
     }
 
-    pub fn is_declaration(&self) -> bool {
-        self.is_declaration
+    pub fn is_forward_declaration(&self) -> bool {
+        self.is_forward_declaration
     }
 }
 

libbindgen/tests/expectations/tests/anon_union.rs

@@ -42,18 +42,8 @@ pub const TErrorResult_UnionState_HasException: TErrorResult_UnionState =
 #[repr(i32)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum TErrorResult_UnionState { HasMessage = 0, }
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct TErrorResult_Message<T> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-}
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct TErrorResult_DOMExceptionInfo<T> {
-    pub _address: u8,
-    pub _phantom_0: ::std::marker::PhantomData<T>,
-}
+pub enum TErrorResult_Message { }
+pub enum TErrorResult_DOMExceptionInfo { }
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct TErrorResult__bindgen_ty_1<T> {

libbindgen/tests/expectations/tests/namespace.rs

@@ -66,6 +66,7 @@ pub mod root {
             #[link_name = "_ZN1w3fooEv"]
             pub fn foo() -> root::C<::std::os::raw::c_int>;
         }
+        pub enum C { }
         extern "C" {
             #[link_name = "_ZN1w4barrEv"]
             pub fn barr() -> root::C<f32>;

libbindgen/tests/expectations/tests/same_struct_name_in_different_namespaces.rs

@@ -4,14 +4,7 @@
 #![allow(non_snake_case)]
 
 
-#[repr(C)]
-#[derive(Debug, Copy)]
-pub struct JS_Zone {
-    pub _address: u8,
-}
-impl Clone for JS_Zone {
-    fn clone(&self) -> Self { *self }
-}
+pub enum JS_Zone { }
 #[repr(C)]
 #[derive(Debug, Copy)]
 pub struct JS_shadow_Zone {