Fix #1085 - Incorrect detection of duplicated constants

xavi-oc · emilio · commit 906841087966 · 2025-07-28T16:44:48.000Z
diff --git a/src/bindgen/ir/constant.rs b/src/bindgen/ir/constant.rs
@@ -546,7 +546,15 @@ impl Constant {
         documentation: Documentation,
         associated_to: Option<Path>,
     ) -> Self {
-        let export_name = path.name().to_owned();
+        let export_name = match associated_to.clone() {
+            Some(associated_to) => path
+                .name()
+                .strip_suffix(associated_to.name())
+                .unwrap()
+                .to_owned(),
+            None => path.name().to_owned(),
+        };
+
         Self {
             path,
             export_name,
diff --git a/src/bindgen/parser.rs b/src/bindgen/parser.rs
@@ -795,7 +795,7 @@ impl Parse {
                 return;
             }
 
-            let path = Path::new(item.ident.unraw().to_string());
+            let path = Path::new(item.ident.unraw().to_string() + impl_path.name());
             match Constant::load(
                 path,
                 mod_cfg,
diff --git a/tests/expectations-symbols/duplicated_constants.c.sym b/tests/expectations-symbols/duplicated_constants.c.sym
@@ -0,0 +1,3 @@
+{
+root;
+};
diff --git a/tests/expectations/duplicated_constants.c b/tests/expectations/duplicated_constants.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint32_t field;
+} Foo;
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+typedef struct {
+  uint32_t field;
+} Bar;
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+void root(Foo a, Bar b);
diff --git a/tests/expectations/duplicated_constants.compat.c b/tests/expectations/duplicated_constants.compat.c
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uint32_t field;
+} Foo;
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+typedef struct {
+  uint32_t field;
+} Bar;
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(Foo a, Bar b);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
diff --git a/tests/expectations/duplicated_constants.cpp b/tests/expectations/duplicated_constants.cpp
@@ -0,0 +1,21 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Foo {
+  uint32_t field;
+};
+constexpr static const uint32_t Foo_FIELD_RELATED_CONSTANT = 0;
+
+struct Bar {
+  uint32_t field;
+};
+constexpr static const uint32_t Bar_FIELD_RELATED_CONSTANT = 0;
+
+extern "C" {
+
+void root(Foo a, Bar b);
+
+}  // extern "C"
diff --git a/tests/expectations/duplicated_constants.pyx b/tests/expectations/duplicated_constants.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 *:
+
+  ctypedef struct Foo:
+    uint32_t field;
+  const uint32_t Foo_FIELD_RELATED_CONSTANT # = 0
+
+  ctypedef struct Bar:
+    uint32_t field;
+  const uint32_t Bar_FIELD_RELATED_CONSTANT # = 0
+
+  void root(Foo a, Bar b);
diff --git a/tests/expectations/duplicated_constants_both.c b/tests/expectations/duplicated_constants_both.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint32_t field;
+} Foo;
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+typedef struct Bar {
+  uint32_t field;
+} Bar;
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+void root(struct Foo a, struct Bar b);
diff --git a/tests/expectations/duplicated_constants_both.compat.c b/tests/expectations/duplicated_constants_both.compat.c
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Foo {
+  uint32_t field;
+} Foo;
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+typedef struct Bar {
+  uint32_t field;
+} Bar;
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a, struct Bar b);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
diff --git a/tests/expectations/duplicated_constants_tag.c b/tests/expectations/duplicated_constants_tag.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint32_t field;
+};
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+struct Bar {
+  uint32_t field;
+};
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+void root(struct Foo a, struct Bar b);
diff --git a/tests/expectations/duplicated_constants_tag.compat.c b/tests/expectations/duplicated_constants_tag.compat.c
@@ -0,0 +1,24 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Foo {
+  uint32_t field;
+};
+#define Foo_FIELD_RELATED_CONSTANT 0
+
+struct Bar {
+  uint32_t field;
+};
+#define Bar_FIELD_RELATED_CONSTANT 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void root(struct Foo a, struct Bar b);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
diff --git a/tests/expectations/duplicated_constants_tag.pyx b/tests/expectations/duplicated_constants_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 struct Foo:
+    uint32_t field;
+  const uint32_t Foo_FIELD_RELATED_CONSTANT # = 0
+
+  cdef struct Bar:
+    uint32_t field;
+  const uint32_t Bar_FIELD_RELATED_CONSTANT # = 0
+
+  void root(Foo a, Bar b);
diff --git a/tests/rust/duplicated_constants.rs b/tests/rust/duplicated_constants.rs
@@ -0,0 +1,20 @@
+#[repr(C)]
+pub struct Foo {
+    field: u32,
+}
+
+impl Foo {
+    pub const FIELD_RELATED_CONSTANT: u32 = 0;
+}
+
+#[repr(C)]
+pub struct Bar {
+    field: u32,
+}
+
+impl Bar {
+    pub const FIELD_RELATED_CONSTANT: u32 = 0;
+}
+
+#[no_mangle]
+pub extern "C" fn root(a: Foo, b: Bar) {}

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ impl Parse {`
`795`	`795`	`return;`
`796`	`796`	`}`
`797`	`797`
`798`		`- let path = Path::new(item.ident.unraw().to_string());`
	`798`	`+ let path = Path::new(item.ident.unraw().to_string() + impl_path.name());`
`799`	`799`	`match Constant::load(`
`800`	`800`	`path,`
`801`	`801`	`mod_cfg,`