Support macros and functions with the same name.

Cargo.toml

@@ -13,3 +13,6 @@ default-members = [
     "bindgen-cli",
     "bindgen-tests",
 ]
+
+# [patch.crates-io]
+# cmacro = { path = "../cmacro-rs" }

bindgen-tests/tests/headers/macro_func_wrapper.h

@@ -2,3 +2,4 @@ void func(int, int);
 
 #define Y 7
 #define wrapper_func(x) func(x, Y)
+#define func(x) func(x, Y)

bindgen/Cargo.toml

@@ -26,7 +26,7 @@ path = "lib.rs"
 
 [dependencies]
 bitflags = "1.0.3"
-cmacro = "0.1.2"
+cmacro = "0.1.3"
 clang-sys = { version = "1", features = ["clang_6_0"] }
 lazycell = "1"
 lazy_static = "1"
@@ -55,6 +55,3 @@ experimental = []
 testing_only_extra_assertions = []
 testing_only_libclang_9 = []
 testing_only_libclang_5 = []
-
-# [patch."https://github.com/reitermarkus/cmacro-rs"]
-# cmacro = { path = "../cmacro-rs" }

bindgen/codegen/macro_def.rs

@@ -62,10 +62,10 @@ impl CodeGenerator for MacroDef {
 
         match self {
             Self::Fn(name) => {
-                if result.seen_function(&canonical_name) {
+                if result.seen_fn_macro(&canonical_name) {
                     return;
                 }
-                result.saw_function(&canonical_name);
+                result.saw_fn_macro(&canonical_name);
 
                 let mut fn_macro = ctx.fn_macro(name).unwrap().clone();
                 let generated_value = match fn_macro.generate(ctx) {

bindgen/codegen/mod.rs

@@ -262,6 +262,7 @@ struct CodegenResult<'a> {
     /// Being these two different declarations.
     functions_seen: HashSet<String>,
     vars_seen: HashSet<String>,
+    fn_macros_seen: HashSet<String>,
 
     /// Used for making bindings to overloaded functions. Maps from a canonical
     /// function name to the number of overloads we have already codegen'd for
@@ -285,6 +286,7 @@ impl<'a> CodegenResult<'a> {
             items_seen: Default::default(),
             functions_seen: Default::default(),
             vars_seen: Default::default(),
+            fn_macros_seen: Default::default(),
             overload_counters: Default::default(),
             items_to_serialize: Default::default(),
         }
@@ -330,6 +332,14 @@ impl<'a> CodegenResult<'a> {
         self.functions_seen.insert(name.into());
     }
 
+    fn seen_fn_macro(&self, name: &str) -> bool {
+        self.fn_macros_seen.contains(name)
+    }
+
+    fn saw_fn_macro(&mut self, name: &str) {
+        self.fn_macros_seen.insert(name.into());
+    }
+
     /// Get the overload number for the given function name. Increments the
     /// counter internally so the next time we ask for the overload for this
     /// name, we get the incremented value, and so on.