ir: Deal with name conflicts correctly in declaration type resolution.

So, basically, make opaque items last, and make previous names override
them.

Fixes #649

src/bindgen/declarationtyperesolver.rs

@@ -2,23 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use std::collections::HashSet;
-
 use crate::bindgen::ir::Path;
-
+use std::collections::hash_map::Entry;
-#[derive(Default)]
+use std::collections::HashMap;
-pub struct DeclarationTypeResolver {
-    structs: HashSet<Path>,
-    enums: HashSet<Path>,
-    unions: HashSet<Path>,
-}
-
-#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
-pub enum DeclarationType {
-    Struct,
-    Enum,
-    Union,
-}
 
 impl DeclarationType {
     pub fn to_str(self) -> &'static str {
@@ -30,29 +16,42 @@ impl DeclarationType {
     }
 }
 
+#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
+pub enum DeclarationType {
+    Struct,
+    Enum,
+    Union,
+}
+
+#[derive(Default)]
+pub struct DeclarationTypeResolver {
+    types: HashMap<Path, Option<DeclarationType>>,
+}
+
 impl DeclarationTypeResolver {
+    fn insert(&mut self, path: &Path, ty: Option<DeclarationType>) {
+        if let Entry::Vacant(vacant_entry) = self.types.entry(path.clone()) {
+            vacant_entry.insert(ty);
+        }
+    }
+
     pub fn add_enum(&mut self, path: &Path) {
-        self.enums.insert(path.clone());
+        self.insert(path, Some(DeclarationType::Enum));
     }
 
     pub fn add_struct(&mut self, path: &Path) {
-        self.structs.insert(path.clone());
+        self.insert(path, Some(DeclarationType::Struct));
     }
 
     pub fn add_union(&mut self, path: &Path) {
-        self.unions.insert(path.clone());
+        self.insert(path, Some(DeclarationType::Union));
+    }
+
+    pub fn add_none(&mut self, path: &Path) {
+        self.insert(path, None);
     }
 
     pub fn type_for(&self, path: &Path) -> Option<DeclarationType> {
-        // FIXME: don't look up by name, but by full path:
+        *self.types.get(path)?
-        if self.structs.contains(path) {
-            Some(DeclarationType::Struct)
-        } else if self.enums.contains(path) {
-            Some(DeclarationType::Enum)
-        } else if self.unions.contains(path) {
-            Some(DeclarationType::Union)
-        } else {
-            None
-        }
     }
 }

src/bindgen/ir/enumeration.rs

@@ -476,12 +476,17 @@ impl Item for Enum {
     }
 
     fn collect_declaration_types(&self, resolver: &mut DeclarationTypeResolver) {
-        if self.tag.is_some() && self.repr.style == ReprStyle::C {
+        if self.tag.is_some() {
-            resolver.add_struct(&self.path);
+            if self.repr.style == ReprStyle::C {
-        } else if self.tag.is_some() && self.repr.style != ReprStyle::C {
+                resolver.add_struct(&self.path);
-            resolver.add_union(&self.path);
+            } else {
+                resolver.add_union(&self.path);
+            }
         } else if self.repr.style == ReprStyle::C {
             resolver.add_enum(&self.path);
+        } else {
+            // This is important to handle conflicting names with opaque items.
+            resolver.add_none(&self.path);
         }
     }
 

src/bindgen/ir/structure.rs

@@ -266,7 +266,9 @@ impl Item for Struct {
     }
 
     fn collect_declaration_types(&self, resolver: &mut DeclarationTypeResolver) {
-        if !self.is_transparent {
+        if self.is_transparent {
+            resolver.add_none(&self.path);
+        } else {
             resolver.add_struct(&self.path);
         }
     }

src/bindgen/ir/typedef.rs

@@ -138,6 +138,10 @@ impl Item for Typedef {
         self.aliased.rename_for_config(config, &self.generic_params);
     }
 
+    fn collect_declaration_types(&self, resolver: &mut DeclarationTypeResolver) {
+        resolver.add_none(&self.path);
+    }
+
     fn resolve_declaration_types(&mut self, resolver: &DeclarationTypeResolver) {
         self.aliased.resolve_declaration_types(resolver);
     }

src/bindgen/library.rs

@@ -318,10 +318,6 @@ impl Library {
             x.collect_declaration_types(&mut resolver);
         });
 
-        self.opaque_items.for_all_items(|x| {
-            x.collect_declaration_types(&mut resolver);
-        });
-
         self.enums.for_all_items(|x| {
             x.collect_declaration_types(&mut resolver);
         });
@@ -330,6 +326,16 @@ impl Library {
             x.collect_declaration_types(&mut resolver);
         });
 
+        self.typedefs.for_all_items(|x| {
+            x.collect_declaration_types(&mut resolver);
+        });
+
+        // NOTE: Intentionally last, so that in case there's an opaque type
+        // which is conflicting with a non-opaque one, the later wins.
+        self.opaque_items.for_all_items(|x| {
+            x.collect_declaration_types(&mut resolver);
+        });
+
         self.enums
             .for_all_items_mut(|x| x.resolve_declaration_types(&resolver));
 

tests/expectations/decl_name_conflicting.both.c

@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+typedef uint32_t BindingType;
+
+typedef struct BindGroupLayoutEntry {
+  BindingType ty;
+} BindGroupLayoutEntry;
+
+void root(struct BindGroupLayoutEntry entry);

tests/expectations/decl_name_conflicting.both.compat.c

@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+#ifndef __cplusplus
+typedef uint32_t BindingType;
+#endif // __cplusplus
+
+typedef struct BindGroupLayoutEntry {
+  BindingType ty;
+} BindGroupLayoutEntry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct BindGroupLayoutEntry entry);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/expectations/decl_name_conflicting.c

@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+typedef uint32_t BindingType;
+
+typedef struct {
+  BindingType ty;
+} BindGroupLayoutEntry;
+
+void root(BindGroupLayoutEntry entry);

tests/expectations/decl_name_conflicting.compat.c

@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+#ifndef __cplusplus
+typedef uint32_t BindingType;
+#endif // __cplusplus
+
+typedef struct {
+  BindingType ty;
+} BindGroupLayoutEntry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(BindGroupLayoutEntry entry);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/expectations/decl_name_conflicting.cpp

@@ -0,0 +1,20 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+enum class BindingType : uint32_t {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+
+struct BindGroupLayoutEntry {
+  BindingType ty;
+};
+
+extern "C" {
+
+void root(BindGroupLayoutEntry entry);
+
+} // extern "C"

tests/expectations/decl_name_conflicting.pyx

@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Buffer # = 0,
+    NotBuffer # = 1,
+  ctypedef uint32_t BindingType;
+
+  ctypedef struct BindGroupLayoutEntry:
+    BindingType ty;
+
+  void root(BindGroupLayoutEntry entry);

tests/expectations/decl_name_conflicting.tag.c

@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+typedef uint32_t BindingType;
+
+struct BindGroupLayoutEntry {
+  BindingType ty;
+};
+
+void root(struct BindGroupLayoutEntry entry);

tests/expectations/decl_name_conflicting.tag.compat.c

@@ -0,0 +1,30 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+enum BindingType
+#ifdef __cplusplus
+  : uint32_t
+#endif // __cplusplus
+ {
+  Buffer = 0,
+  NotBuffer = 1,
+};
+#ifndef __cplusplus
+typedef uint32_t BindingType;
+#endif // __cplusplus
+
+struct BindGroupLayoutEntry {
+  BindingType ty;
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct BindGroupLayoutEntry entry);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus

tests/expectations/decl_name_conflicting.tag.pyx

@@ -0,0 +1,17 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef enum:
+    Buffer # = 0,
+    NotBuffer # = 1,
+  ctypedef uint32_t BindingType;
+
+  cdef struct BindGroupLayoutEntry:
+    BindingType ty;
+
+  void root(BindGroupLayoutEntry entry);

tests/rust/decl_name_conflicting.rs

@@ -0,0 +1,14 @@
+mod uhoh {
+    enum BindingType { Buffer, NotBuffer }
+}
+
+#[repr(u32)]
+pub enum BindingType { Buffer = 0, NotBuffer = 1 }
+
+#[repr(C)]
+pub struct BindGroupLayoutEntry {
+    pub ty: BindingType, // This is the repr(u32) enum
+}
+
+#[no_mangle]
+pub extern "C" fn root(entry: BindGroupLayoutEntry) {}