Account for cfg items in foreign mods.

Fixes #807
mozilla · Apr 15, 2024 · f071790 · f071790
1 parent 49a387e
commit f071790
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 1 deletion.
diff --git a/src/bindgen/parser.rs b/src/bindgen/parser.rs
@@ -605,6 +605,7 @@ impl Parse {
             return;
         }
 
+        let mod_cfg = Cfg::append(mod_cfg, Cfg::load(&item.attrs));
         for foreign_item in &item.items {
             if let syn::ForeignItem::Fn(ref function) = *foreign_item {
                 if !config
@@ -618,7 +619,7 @@ impl Parse {
                     return;
                 }
                 let path = Path::new(function.sig.ident.unraw().to_string());
-                match Function::load(path, None, &function.sig, true, &function.attrs, mod_cfg) {
+                match Function::load(path, None, &function.sig, true, &function.attrs, mod_cfg.as_ref()) {
                     Ok(func) => {
                         info!("Take {}::{}.", crate_name, &function.sig.ident);
 

diff --git a/tests/expectations/cfg.c b/tests/expectations/cfg.c
@@ -78,6 +78,11 @@ typedef struct {
   ;
 } ConditionalField;
 
+typedef struct {
+  int32_t x;
+  float y;
+} Normal;
+
 #if (defined(PLATFORM_UNIX) && defined(X11))
 void root(FooHandle a, C c);
 #endif
@@ -87,3 +92,11 @@ void root(BarHandle a, C c);
 #endif
 
 void cond(ConditionalField a);
+
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(Normal a);
+#endif
diff --git a/tests/expectations/cfg.compat.c b/tests/expectations/cfg.compat.c
@@ -96,6 +96,11 @@ typedef struct {
   ;
 } ConditionalField;
 
+typedef struct {
+  int32_t x;
+  float y;
+} Normal;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -110,6 +115,14 @@ void root(BarHandle a, C c);
 
 void cond(ConditionalField a);
 
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(Normal a);
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff --git a/tests/expectations/cfg.cpp b/tests/expectations/cfg.cpp
@@ -202,6 +202,20 @@ struct ConditionalField {
   ;
 };
 
+struct Normal {
+  int32_t x;
+  float y;
+
+  bool operator==(const Normal& other) const {
+    return x == other.x &&
+           y == other.y;
+  }
+  bool operator!=(const Normal& other) const {
+    return x != other.x ||
+           y != other.y;
+  }
+};
+
 extern "C" {
 
 #if (defined(PLATFORM_UNIX) && defined(X11))
@@ -214,4 +228,12 @@ void root(BarHandle a, C c);
 
 void cond(ConditionalField a);
 
+#if defined(PLATFORM_WIN)
+extern int32_t foo();
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(Normal a);
+#endif
+
 } // extern "C"
diff --git a/tests/expectations/cfg.pyx b/tests/expectations/cfg.pyx
@@ -58,10 +58,20 @@ cdef extern from *:
   ctypedef struct ConditionalField:
     int32_t field;
 
+  ctypedef struct Normal:
+    int32_t x;
+    float y;
+
   IF (PLATFORM_UNIX and X11):
     void root(FooHandle a, C c);
 
   IF (PLATFORM_WIN or M_32):
     void root(BarHandle a, C c);
 
   void cond(ConditionalField a);
+
+  IF PLATFORM_WIN:
+    extern int32_t foo();
+
+  IF PLATFORM_WIN:
+    extern void bar(Normal a);
diff --git a/tests/expectations/cfg_both.c b/tests/expectations/cfg_both.c
@@ -78,6 +78,11 @@ typedef struct ConditionalField {
   ;
 } ConditionalField;
 
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
 #if (defined(PLATFORM_UNIX) && defined(X11))
 void root(struct FooHandle a, union C c);
 #endif
@@ -87,3 +92,11 @@ void root(struct BarHandle a, union C c);
 #endif
 
 void cond(struct ConditionalField a);
+
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(struct Normal a);
+#endif
diff --git a/tests/expectations/cfg_both.compat.c b/tests/expectations/cfg_both.compat.c
@@ -96,6 +96,11 @@ typedef struct ConditionalField {
   ;
 } ConditionalField;
 
+typedef struct Normal {
+  int32_t x;
+  float y;
+} Normal;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -110,6 +115,14 @@ void root(struct BarHandle a, union C c);
 
 void cond(struct ConditionalField a);
 
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(struct Normal a);
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff --git a/tests/expectations/cfg_tag.c b/tests/expectations/cfg_tag.c
@@ -78,6 +78,11 @@ struct ConditionalField {
   ;
 };
 
+struct Normal {
+  int32_t x;
+  float y;
+};
+
 #if (defined(PLATFORM_UNIX) && defined(X11))
 void root(struct FooHandle a, union C c);
 #endif
@@ -87,3 +92,11 @@ void root(struct BarHandle a, union C c);
 #endif
 
 void cond(struct ConditionalField a);
+
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(struct Normal a);
+#endif
diff --git a/tests/expectations/cfg_tag.compat.c b/tests/expectations/cfg_tag.compat.c
@@ -96,6 +96,11 @@ struct ConditionalField {
   ;
 };
 
+struct Normal {
+  int32_t x;
+  float y;
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -110,6 +115,14 @@ void root(struct BarHandle a, union C c);
 
 void cond(struct ConditionalField a);
 
+#if defined(PLATFORM_WIN)
+extern int32_t foo(void);
+#endif
+
+#if defined(PLATFORM_WIN)
+extern void bar(struct Normal a);
+#endif
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // __cplusplus
diff --git a/tests/expectations/cfg_tag.pyx b/tests/expectations/cfg_tag.pyx
@@ -58,10 +58,20 @@ cdef extern from *:
   cdef struct ConditionalField:
     int32_t field;
 
+  cdef struct Normal:
+    int32_t x;
+    float y;
+
   IF (PLATFORM_UNIX and X11):
     void root(FooHandle a, C c);
 
   IF (PLATFORM_WIN or M_32):
     void root(BarHandle a, C c);
 
   void cond(ConditionalField a);
+
+  IF PLATFORM_WIN:
+    extern int32_t foo();
+
+  IF PLATFORM_WIN:
+    extern void bar(Normal a);
diff --git a/tests/rust/cfg.rs b/tests/rust/cfg.rs
@@ -62,3 +62,17 @@ pub extern "C" fn root(a: BarHandle, c: C)
 #[no_mangle]
 pub extern "C" fn cond(a: ConditionalField)
 { }
+
+// src/lib.rs
+#[repr(C)]
+struct Normal {
+    x: i32,
+    y: f32,
+}
+
+#[cfg(windows)]
+extern "C" {
+    fn foo() -> i32;
+
+    fn bar(a: Normal);
+}