ir: simplify_standard_types should be recursive.

Stuff like *mut Option<&mut Foo> should really be *mut *mut Foo for example.
mozilla · Feb 24, 2021 · 7312b99 · 7312b99
1 parent 8236c82
commit 7312b99
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 54 deletions.
diff --git a/src/bindgen/ir/ty.rs b/src/bindgen/ir/ty.rs
@@ -641,25 +641,29 @@ impl Type {
         if let Some(ty) = self.simplified_type(config) {
             *self = ty;
         }
+
+        self.visit_types(|ty| ty.simplify_standard_types(config))
     }
 
     pub fn replace_self_with(&mut self, self_ty: &Path) {
+        if let Type::Path(ref mut generic_path) = *self {
+            generic_path.replace_self_with(self_ty);
+        }
+        self.visit_types(|ty| ty.replace_self_with(self_ty))
+    }
+
+    fn visit_types(&mut self, mut visitor: impl FnMut(&mut Type)) {
         match *self {
-            Type::Array(ref mut ty, ..) | Type::Ptr { ref mut ty, .. } => {
-                ty.replace_self_with(self_ty)
-            }
-            Type::Path(ref mut generic_path) => {
-                generic_path.replace_self_with(self_ty);
-            }
-            Type::Primitive(..) => {}
+            Type::Array(ref mut ty, ..) | Type::Ptr { ref mut ty, .. } => visitor(ty),
+            Type::Path(..) | Type::Primitive(..) => {}
             Type::FuncPtr {
                 ref mut ret,
                 ref mut args,
                 ..
             } => {
-                ret.replace_self_with(self_ty);
+                visitor(ret);
                 for arg in args {
-                    arg.1.replace_self_with(self_ty);
+                    visitor(&mut arg.1)
                 }
             }
         }

diff --git a/tests/expectations/simplify_option_ptr.both.c b/tests/expectations/simplify_option_ptr.both.c
@@ -7,24 +7,23 @@ typedef struct Opaque Opaque;
 
 typedef struct Option_____Opaque Option_____Opaque;
 
-typedef struct Option_______c_void Option_______c_void;
-
 typedef struct Foo {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 } Foo;
 
 typedef union Bar {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 } Bar;
 
 void root(const struct Opaque *a,
           struct Opaque *b,
           struct Foo c,
           union Bar d,
-          struct Option_____Opaque *e);
+          struct Option_____Opaque *e,
+          void (*f)(const struct Opaque*));
diff --git a/tests/expectations/simplify_option_ptr.both.compat.c b/tests/expectations/simplify_option_ptr.both.compat.c
@@ -7,20 +7,18 @@ typedef struct Opaque Opaque;
 
 typedef struct Option_____Opaque Option_____Opaque;
 
-typedef struct Option_______c_void Option_______c_void;
-
 typedef struct Foo {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 } Foo;
 
 typedef union Bar {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 } Bar;
 
 #ifdef __cplusplus
@@ -31,7 +29,8 @@ void root(const struct Opaque *a,
           struct Opaque *b,
           struct Foo c,
           union Bar d,
-          struct Option_____Opaque *e);
+          struct Option_____Opaque *e,
+          void (*f)(const struct Opaque*));
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/tests/expectations/simplify_option_ptr.c b/tests/expectations/simplify_option_ptr.c
@@ -7,20 +7,18 @@ typedef struct Opaque Opaque;
 
 typedef struct Option_____Opaque Option_____Opaque;
 
-typedef struct Option_______c_void Option_______c_void;
-
 typedef struct {
   const Opaque *x;
   Opaque *y;
   void (*z)(void);
-  Option_______c_void *zz;
+  void (**zz)(void);
 } Foo;
 
 typedef union {
   const Opaque *x;
   Opaque *y;
   void (*z)(void);
-  Option_______c_void *zz;
+  void (**zz)(void);
 } Bar;
 
-void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e);
+void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e, void (*f)(const Opaque*));
diff --git a/tests/expectations/simplify_option_ptr.compat.c b/tests/expectations/simplify_option_ptr.compat.c
@@ -7,27 +7,25 @@ typedef struct Opaque Opaque;
 
 typedef struct Option_____Opaque Option_____Opaque;
 
-typedef struct Option_______c_void Option_______c_void;
-
 typedef struct {
   const Opaque *x;
   Opaque *y;
   void (*z)(void);
-  Option_______c_void *zz;
+  void (**zz)(void);
 } Foo;
 
 typedef union {
   const Opaque *x;
   Opaque *y;
   void (*z)(void);
-  Option_______c_void *zz;
+  void (**zz)(void);
 } Bar;
 
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e);
+void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e, void (*f)(const Opaque*));
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/tests/expectations/simplify_option_ptr.cpp b/tests/expectations/simplify_option_ptr.cpp
@@ -13,18 +13,18 @@ struct Foo {
   const Opaque *x;
   Opaque *y;
   void (*z)();
-  Option<void(*)()> *zz;
+  void (**zz)();
 };
 
 union Bar {
   const Opaque *x;
   Opaque *y;
   void (*z)();
-  Option<void(*)()> *zz;
+  void (**zz)();
 };
 
 extern "C" {
 
-void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option<Opaque*> *e);
+void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option<Opaque*> *e, void (*f)(const Opaque*));
 
 } // extern "C"
diff --git a/tests/expectations/simplify_option_ptr.pyx b/tests/expectations/simplify_option_ptr.pyx
@@ -12,19 +12,21 @@ cdef extern from *:
   ctypedef struct Option_____Opaque:
     pass
 
-  ctypedef struct Option_______c_void:
-    pass
-
   ctypedef struct Foo:
     const Opaque *x;
     Opaque *y;
     void (*z)();
-    Option_______c_void *zz;
+    void (**zz)();
 
   ctypedef union Bar:
     const Opaque *x;
     Opaque *y;
     void (*z)();
-    Option_______c_void *zz;
+    void (**zz)();
 
-  void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e);
+  void root(const Opaque *a,
+            Opaque *b,
+            Foo c,
+            Bar d,
+            Option_____Opaque *e,
+            void (*f)(const Opaque*));
diff --git a/tests/expectations/simplify_option_ptr.tag.c b/tests/expectations/simplify_option_ptr.tag.c
@@ -7,24 +7,23 @@ struct Opaque;
 
 struct Option_____Opaque;
 
-struct Option_______c_void;
-
 struct Foo {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 };
 
 union Bar {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 };
 
 void root(const struct Opaque *a,
           struct Opaque *b,
           struct Foo c,
           union Bar d,
-          struct Option_____Opaque *e);
+          struct Option_____Opaque *e,
+          void (*f)(const struct Opaque*));
diff --git a/tests/expectations/simplify_option_ptr.tag.compat.c b/tests/expectations/simplify_option_ptr.tag.compat.c
@@ -7,20 +7,18 @@ struct Opaque;
 
 struct Option_____Opaque;
 
-struct Option_______c_void;
-
 struct Foo {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 };
 
 union Bar {
   const struct Opaque *x;
   struct Opaque *y;
   void (*z)(void);
-  struct Option_______c_void *zz;
+  void (**zz)(void);
 };
 
 #ifdef __cplusplus
@@ -31,7 +29,8 @@ void root(const struct Opaque *a,
           struct Opaque *b,
           struct Foo c,
           union Bar d,
-          struct Option_____Opaque *e);
+          struct Option_____Opaque *e,
+          void (*f)(const struct Opaque*));
 
 #ifdef __cplusplus
 } // extern "C"

diff --git a/tests/expectations/simplify_option_ptr.tag.pyx b/tests/expectations/simplify_option_ptr.tag.pyx
@@ -12,19 +12,21 @@ cdef extern from *:
   cdef struct Option_____Opaque:
     pass
 
-  cdef struct Option_______c_void:
-    pass
-
   cdef struct Foo:
     const Opaque *x;
     Opaque *y;
     void (*z)();
-    Option_______c_void *zz;
+    void (**zz)();
 
   cdef union Bar:
     const Opaque *x;
     Opaque *y;
     void (*z)();
-    Option_______c_void *zz;
+    void (**zz)();
 
-  void root(const Opaque *a, Opaque *b, Foo c, Bar d, Option_____Opaque *e);
+  void root(const Opaque *a,
+            Opaque *b,
+            Foo c,
+            Bar d,
+            Option_____Opaque *e,
+            void (*f)(const Opaque*));
diff --git a/tests/rust/simplify_option_ptr.rs b/tests/rust/simplify_option_ptr.rs
@@ -24,4 +24,5 @@ pub extern "C" fn root(
     c: Foo,
     d: Bar,
     e: *mut Option<*mut Opaque>,
+    f: extern "C" fn(Option<&Opaque>),
 ) { }