Support enum types in macros.

rust-lang · Feb 21, 2024 · 34cdf9f · 34cdf9f
1 parent 57ef7cf
commit 34cdf9f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs b/bindgen-tests/tests/expectations/tests/jsval_layout_opaque.rs
diff --git a/bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs b/bindgen-tests/tests/expectations/tests/jsval_layout_opaque_1_0.rs
diff --git a/bindgen-tests/tests/expectations/tests/macro_enum_retval.rs b/bindgen-tests/tests/expectations/tests/macro_enum_retval.rs
diff --git a/bindgen-tests/tests/headers/macro_enum_retval.h b/bindgen-tests/tests/headers/macro_enum_retval.h
@@ -0,0 +1,9 @@
+// bindgen-flags: --experimental --generate-fn-macros
+
+typedef enum {
+    wrong = 0,
+    right,
+} truth;
+
+#define get_wrong() wrong
+
diff --git a/bindgen/ir/context.rs b/bindgen/ir/context.rs
@@ -3238,15 +3238,23 @@ impl cmacro::CodegenContext for BindgenContext {
             .last_callback(|c| c.fn_macro_arg_type(name, arg))
     }
 
-    fn resolve_enum_variant(&self, variant: &str) -> Option<syn::Expr> {
+    fn resolve_enum_variant(
+        &self,
+        variant: &str,
+    ) -> Option<(syn::Type, syn::Expr)> {
         let (item_id, enum_variant) = self.enum_variant(variant)?;
 
         let item = self.resolve_item(item_id);
         if item.is_blocklisted(self) {
             return None;
         }
 
-        Some(enum_variant.clone())
+        let enum_ty = match item.kind() {
+            ItemKind::Type(enum_ty) => enum_ty.to_rust_ty_or_opaque(self, item),
+            _ => return None,
+        };
+
+        Some((enum_ty, enum_variant.clone()))
     }
 
     fn resolve_ty(&self, ty: &str) -> Option<syn::Type> {