aboutsummaryrefslogtreecommitdiff
path: root/src/codegen.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-04-22 12:52:48 -0400
committerGitHub <noreply@github.com>2020-04-22 12:52:48 -0400
commit173a143dd04f9ec75355c04be9b0e6353ee9bc03 (patch)
tree3abbee7296ffab6e9e4b40f0d65a23dd9fd4ead7 /src/codegen.cpp
parent0a2519fafb083e13fb40eac5afcfcb8b741e3438 (diff)
parent155e631aa6f9fabc101abceeeec00b4808a3e4e3 (diff)
downloadzig-173a143dd04f9ec75355c04be9b0e6353ee9bc03.tar.gz
zig-173a143dd04f9ec75355c04be9b0e6353ee9bc03.zip
Merge pull request #5133 from LemonBoy/win-progress
Progressbar for Windows
Diffstat (limited to 'src/codegen.cpp')
-rw-r--r--src/codegen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codegen.cpp b/src/codegen.cpp
index dad8e4768a..730f2695e0 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -2071,7 +2071,7 @@ var_ok:
void walk_function_params(CodeGen *g, ZigType *fn_type, FnWalk *fn_walk) {
CallingConvention cc = fn_type->data.fn.fn_type_id.cc;
- if (cc == CallingConventionC) {
+ if (!calling_convention_allows_zig_types(cc)) {
size_t src_i = 0;
for (;;) {
if (!iter_function_params_c_abi(g, fn_type, fn_walk, src_i))
@@ -7862,7 +7862,7 @@ static void do_code_gen(CodeGen *g) {
FnTypeId *fn_type_id = &fn_table_entry->type_entry->data.fn.fn_type_id;
CallingConvention cc = fn_type_id->cc;
- bool is_c_abi = cc == CallingConventionC;
+ bool is_c_abi = !calling_convention_allows_zig_types(cc);
bool want_sret = want_first_arg_sret(g, fn_type_id);
LLVMValueRef fn = fn_llvm_value(g, fn_table_entry);