Commit 55acb29d68e7cb9a7585929f60c2dfb4c39a3b04 | zig

author	xdBronch <51252236+xdBronch@users.noreply.github.com> 2025-05-06 19:08:15-04:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2025-05-09 16:43:35+02:00
log	55acb29d68e7cb9a7585929f60c2dfb4c39a3b04
tree	a42d48170b5cbcd06d83e2aebe2923be7f550caf
parent	b21fa8e2cd98d487d50755416c7ab90ebd6e620e
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

translate-c: fix callconv attribute in macro

2 files changed, 19 insertions(+), 6 deletions(-)

src
- translate_c.zig
test
- cases
  - translate_c
    macro_calling_convention.c

src/translate_c.zig+10-6

 @@ -403,22 +403,26 @@ fn transFnDecl(c: *Context, scope: *Scope, fn_decl: *const clang.FunctionDecl) E
         switch (fn_type.getTypeClass()) {
             .Attributed => {
-                const attr_type = @as(*const clang.AttributedType, @ptrCast(fn_type));
+                const attr_type: *const clang.AttributedType = @ptrCast(fn_type);
                 fn_qt = attr_type.getEquivalentType();
             },
             .Paren => {
-                const paren_type = @as(*const clang.ParenType, @ptrCast(fn_type));
+                const paren_type: *const clang.ParenType = @ptrCast(fn_type);
                 fn_qt = paren_type.getInnerType();
             },
+            .MacroQualified => {
+                const macroqualified_ty: *const clang.MacroQualifiedType = @ptrCast(fn_type);
+                fn_qt = macroqualified_ty.getModifiedType();
+            },
             else => break fn_type,
         }
     };
-    const fn_ty = @as(*const clang.FunctionType, @ptrCast(fn_type));
+    const fn_ty: *const clang.FunctionType = @ptrCast(fn_type);
     const return_qt = fn_ty.getReturnType();
     const proto_node = switch (fn_type.getTypeClass()) {
         .FunctionProto => blk: {
-            const fn_proto_type = @as(*const clang.FunctionProtoType, @ptrCast(fn_type));
+            const fn_proto_type: *const clang.FunctionProtoType = @ptrCast(fn_type);
             if (has_body and fn_proto_type.isVariadic()) {
                 decl_ctx.has_body = false;
                 decl_ctx.storage_class = .Extern;
 @@ -434,7 +438,7 @@ fn transFnDecl(c: *Context, scope: *Scope, fn_decl: *const clang.FunctionDecl) E
             };
         },
         .FunctionNoProto => blk: {
-            const fn_no_proto_type = @as(*const clang.FunctionType, @ptrCast(fn_type));
+            const fn_no_proto_type: *const clang.FunctionType = @ptrCast(fn_type);
             break :blk transFnNoProto(c, fn_no_proto_type, fn_decl_loc, decl_ctx, true) catch |err| switch (err) {
                 error.UnsupportedType => {
                     return failDecl(c, fn_decl_loc, fn_name, "unable to resolve prototype of function", .{});
 @@ -490,7 +494,7 @@ fn transFnDecl(c: *Context, scope: *Scope, fn_decl: *const clang.FunctionDecl) E
         param_id += 1;
     }
-    const casted_body = @as(*const clang.CompoundStmt, @ptrCast(body_stmt));
+    const casted_body: *const clang.CompoundStmt = @ptrCast(body_stmt);
     transCompoundStmtInline(c, casted_body, &block_scope) catch |err| switch (err) {
         error.OutOfMemory => |e| return e,
         error.UnsupportedTranslation,

test/cases/translate_c/macro_calling_convention.c created+9

...	@@ -0,0 +1,9 @@
1	#define SYSV_ABI __attribute__((sysv_abi))
2	void SYSV_ABI foo(void);
3
4
5	// translate-c
6	// c_frontend=clang
7	// target=x86_64-windows
8	//
9	// pub extern fn foo() callconv(.{ .x86_64_sysv = .{} }) void;