mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-18 23:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

translate-c: fix variadic function calls

Browse Source 
1702b413 introduced a bug with variadic function calls - trying to access the
paramType of non-existent parameters.
This commit is contained in:
Evan Haas 2021-01-18 11:03:14 -08:00 committed by Andrew Kelley
parent 58344e0017
commit bea791b639
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/translate_c.zig
View File

@ -3130,12 +3130,15 @@ fn transCallExpr(rp: RestorePoint, scope: *Scope, stmt: *const clang.CallExpr, r
if (fn_ty) |ty| {
switch (ty) {
.Proto => |fn_proto| {
const param_qt = fn_proto.getParamType(@intCast(c_uint, i));
if (isBoolRes(call_param) and cIsNativeInt(param_qt)) {
const builtin_node = try rp.c.createBuiltinCall("@boolToInt", 1);
builtin_node.params()[0] = call_param;
builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
call_param = &builtin_node.base;
const param_count = fn_proto.getNumParams();
if (i < param_count) {
const param_qt = fn_proto.getParamType(@intCast(c_uint, i));
if (isBoolRes(call_param) and cIsNativeInt(param_qt)) {
const builtin_node = try rp.c.createBuiltinCall("@boolToInt", 1);
builtin_node.params()[0] = call_param;
builtin_node.rparen_token = try appendToken(rp.c, .RParen, ")");
call_param = &builtin_node.base;
}
}
},
else => {},

9
test/run_translated_c.zig
View File

@ -737,4 +737,13 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void {
\\ return 0;
\\}
, "");
cases.add("Variadic function call",
\\#define _NO_CRT_STDIO_INLINE 1
\\#include <stdio.h>
\\int main(void) {
\\ printf("%d %d\n", 1, 2);
\\ return 0;
\\}
, "1 2" ++ nl);
}