authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2019-12-15 11:24:44+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-15 14:42:53-05:00
logf1407b4b7ebe33f00cc8222e875ce271716671ad
tree6de02da9460658c297e0de3322dc4b0b166719cb
parent19ddbd9e9e691ff7ab8789e8c6962497fbba4b88

Generate the fn pointers into the correct address space

Fixes #3645

4 files changed, 12 insertions(+), 4 deletions(-)

src/analyze.cpp+4-2
......@@ -8779,7 +8779,8 @@ static void resolve_llvm_types_fn_type(CodeGen *g, ZigType *fn_type) {
87798779
87808780 fn_type->data.fn.raw_type_ref = LLVMFunctionType(get_llvm_type(g, gen_return_type),
87818781 gen_param_types.items, (unsigned int)gen_param_types.length, fn_type_id->is_var_args);
8782 fn_type->llvm_type = LLVMPointerType(fn_type->data.fn.raw_type_ref, 0);
8782 const unsigned fn_addrspace = ZigLLVMDataLayoutGetProgramAddressSpace(g->target_data_ref);
8783 fn_type->llvm_type = LLVMPointerType(fn_type->data.fn.raw_type_ref, fn_addrspace);
87838784 fn_type->data.fn.raw_di_type = ZigLLVMCreateSubroutineType(g->dbuilder, param_di_types.items, (int)param_di_types.length, 0);
87848785 fn_type->llvm_di_type = ZigLLVMCreateDebugPointerType(g->dbuilder, fn_type->data.fn.raw_di_type,
87858786 LLVMStoreSizeOfType(g->target_data_ref, fn_type->llvm_type),
......@@ -8888,7 +8889,8 @@ static void resolve_llvm_types_any_frame(CodeGen *g, ZigType *any_frame_type, Re
88888889
88898890 ZigType *result_type = any_frame_type->data.any_frame.result_type;
88908891 ZigType *ptr_result_type = (result_type == nullptr) ? nullptr : get_pointer_to_type(g, result_type, false);
8891 LLVMTypeRef ptr_fn_llvm_type = LLVMPointerType(fn_type, 0);
8892 const unsigned fn_addrspace = ZigLLVMDataLayoutGetProgramAddressSpace(g->target_data_ref);
8893 LLVMTypeRef ptr_fn_llvm_type = LLVMPointerType(fn_type, fn_addrspace);
88928894 if (result_type == nullptr) {
88938895 g->anyframe_fn_type = ptr_fn_llvm_type;
88948896 }
src/codegen.cpp+3-2
......@@ -422,9 +422,10 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
422422 LLVMTypeRef fn_llvm_type = fn->raw_type_ref;
423423 LLVMValueRef llvm_fn = nullptr;
424424 if (fn->body_node == nullptr) {
425 const unsigned fn_addrspace = ZigLLVMDataLayoutGetProgramAddressSpace(g->target_data_ref);
425426 LLVMValueRef existing_llvm_fn = LLVMGetNamedFunction(g->module, symbol_name);
426427 if (existing_llvm_fn) {
427 return LLVMConstBitCast(existing_llvm_fn, LLVMPointerType(fn_llvm_type, 0));
428 return LLVMConstBitCast(existing_llvm_fn, LLVMPointerType(fn_llvm_type, fn_addrspace));
428429 } else {
429430 Buf *buf_symbol_name = buf_create_from_str(symbol_name);
430431 auto entry = g->exported_symbol_names.maybe_get(buf_symbol_name);
......@@ -447,7 +448,7 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
447448 resolve_llvm_types_fn(g, tld_fn->fn_entry);
448449 tld_fn->fn_entry->llvm_value = LLVMAddFunction(g->module, symbol_name,
449450 tld_fn->fn_entry->raw_type_ref);
450 llvm_fn = LLVMConstBitCast(tld_fn->fn_entry->llvm_value, LLVMPointerType(fn_llvm_type, 0));
451 llvm_fn = LLVMConstBitCast(tld_fn->fn_entry->llvm_value, LLVMPointerType(fn_llvm_type, fn_addrspace));
451452 return llvm_fn;
452453 }
453454 }
src/zig_llvm.cpp+4
......@@ -156,6 +156,10 @@ unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) {
156156 return unwrap(TD)->getStackAlignment();
157157}
158158
159unsigned ZigLLVMDataLayoutGetProgramAddressSpace(LLVMTargetDataRef TD) {
160 return unwrap(TD)->getProgramAddressSpace();
161}
162
159163bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref,
160164 const char *filename, ZigLLVM_EmitOutputType output_type, char **error_message, bool is_debug,
161165 bool is_small, bool time_report)
src/zig_llvm.h+1
......@@ -475,5 +475,6 @@ ZIG_EXTERN_C void ZigLLVMGetNativeTarget(enum ZigLLVM_ArchType *arch_type, enum
475475 enum ZigLLVM_ObjectFormatType *oformat);
476476
477477ZIG_EXTERN_C unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD);
478ZIG_EXTERN_C unsigned ZigLLVMDataLayoutGetProgramAddressSpace(LLVMTargetDataRef TD);
478479
479480#endif