From fbb6d1d7ee634ac04df7b53abec842c30fafefed Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 14 May 2016 20:40:14 -0700 Subject: [PATCH] support extern C ABI for return types --- src/analyze.cpp | 2 +- src/codegen.cpp | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/analyze.cpp b/src/analyze.cpp index d28b4152b5..937a7627de 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -702,7 +702,7 @@ TypeTableEntry *get_fn_type(CodeGen *g, FnTypeId *fn_type_id) { // next, loop over the parameters again and compute debug information // and codegen information - bool first_arg_return = handle_is_ptr(fn_type_id->return_type); + bool first_arg_return = !fn_type_id->is_extern && handle_is_ptr(fn_type_id->return_type); // +1 for maybe making the first argument the return value LLVMTypeRef *gen_param_types = allocate(1 + fn_type_id->param_count); // +1 because 0 is the return type and +1 for maybe making first arg ret val diff --git a/src/codegen.cpp b/src/codegen.cpp index 122dac5b42..b25a3b6869 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -2329,11 +2329,18 @@ static LLVMValueRef gen_return(CodeGen *g, AstNode *source_node, LLVMValueRef va } TypeTableEntry *return_type = g->cur_fn->type_entry->data.fn.fn_type_id.return_type; + bool is_extern = g->cur_fn->type_entry->data.fn.fn_type_id.is_extern; if (handle_is_ptr(return_type)) { - assert(g->cur_ret_ptr); - gen_assign_raw(g, source_node, BinOpTypeAssign, g->cur_ret_ptr, value, return_type, return_type); - set_debug_source_node(g, source_node); - LLVMBuildRetVoid(g->builder); + if (is_extern) { + set_debug_source_node(g, source_node); + LLVMValueRef by_val_value = LLVMBuildLoad(g->builder, value, ""); + LLVMBuildRet(g->builder, by_val_value); + } else { + assert(g->cur_ret_ptr); + gen_assign_raw(g, source_node, BinOpTypeAssign, g->cur_ret_ptr, value, return_type, return_type); + set_debug_source_node(g, source_node); + LLVMBuildRetVoid(g->builder); + } } else { set_debug_source_node(g, source_node); LLVMBuildRet(g->builder, value); @@ -3898,7 +3905,9 @@ static void do_code_gen(CodeGen *g) { // nothing to do } else if (fn_type->data.fn.fn_type_id.return_type->id == TypeTableEntryIdPointer) { LLVMZigAddNonNullAttr(fn_table_entry->fn_value, 0); - } else if (handle_is_ptr(fn_type->data.fn.fn_type_id.return_type)) { + } else if (handle_is_ptr(fn_type->data.fn.fn_type_id.return_type) && + !fn_type->data.fn.fn_type_id.is_extern) + { LLVMValueRef first_arg = LLVMGetParam(fn_table_entry->fn_value, 0); LLVMAddAttribute(first_arg, LLVMStructRetAttribute); LLVMZigAddNonNullAttr(fn_table_entry->fn_value, 1);