From 54fbe7560ec0f3a9d5016f2058b07463767bf6e1 Mon Sep 17 00:00:00 2001 From: realazthat Date: Fri, 5 Feb 2016 16:29:26 -0500 Subject: [PATCH 1/2] Added code for generating nonnull attributes --- src/codegen.cpp | 4 ++++ src/zig_llvm.cpp | 10 ++++++++++ src/zig_llvm.hpp | 1 + 3 files changed, 15 insertions(+) diff --git a/src/codegen.cpp b/src/codegen.cpp index f4defb8405..2965c8e593 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -2905,6 +2905,10 @@ static void do_code_gen(CodeGen *g) { if (param_type->id == TypeTableEntryIdPointer) { // when https://github.com/andrewrk/zig/issues/82 is fixed, add // non null attribute here + + ///`i` is arg index + 1 + ///I think that 0 is the return index, but it has a named LLVM constant variable + LLVMZigAddNonNullAttr(fn_table_entry->fn_value, param_decl_i + 1); } if (is_byval) { // TODO diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index b0e32e8b6b..5749a996d5 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -140,6 +140,16 @@ LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *A return wrap(unwrap(B)->Insert(call_inst)); } +void LLVMZigAddNonNullAttr(LLVMValueRef fn, unsigned i) +{ + assert( isa(unwrap(fn)) ); + + Function *unwrapped_function = reinterpret_cast(unwrap(fn)); + + unwrapped_function->addAttribute(i, Attribute::NonNull); +} + + LLVMZigDIType *LLVMZigCreateDebugPointerType(LLVMZigDIBuilder *dibuilder, LLVMZigDIType *pointee_type, uint64_t size_in_bits, uint64_t align_in_bits, const char *name) { diff --git a/src/zig_llvm.hpp b/src/zig_llvm.hpp index 74b2499276..d4e3548b70 100644 --- a/src/zig_llvm.hpp +++ b/src/zig_llvm.hpp @@ -39,6 +39,7 @@ void LLVMZigOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args, unsigned NumArgs, unsigned CC, const char *Name); +void LLVMZigAddNonNullAttr(LLVMValueRef fn, unsigned i); LLVMZigDIType *LLVMZigCreateDebugPointerType(LLVMZigDIBuilder *dibuilder, LLVMZigDIType *pointee_type, uint64_t size_in_bits, uint64_t align_in_bits, const char *name); From 2ee80858b42796c931fb2fe0b45e0ebb6f8ffb30 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 5 Feb 2016 14:48:23 -0700 Subject: [PATCH 2/2] codegen: use gen_index for nonnull attribute also put nonnull on sret params closes #82 --- src/codegen.cpp | 8 ++------ src/zig_llvm.hpp | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/codegen.cpp b/src/codegen.cpp index 2965c8e593..d002c716ef 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -2876,6 +2876,7 @@ static void do_code_gen(CodeGen *g) { if (handle_is_ptr(fn_type->data.fn.fn_type_id.return_type)) { LLVMValueRef first_arg = LLVMGetParam(fn_table_entry->fn_value, 0); LLVMAddAttribute(first_arg, LLVMStructRetAttribute); + LLVMZigAddNonNullAttr(fn_table_entry->fn_value, 1); } // set parameter attributes @@ -2903,12 +2904,7 @@ static void do_code_gen(CodeGen *g) { LLVMAddAttribute(argument_val, LLVMReadOnlyAttribute); } if (param_type->id == TypeTableEntryIdPointer) { - // when https://github.com/andrewrk/zig/issues/82 is fixed, add - // non null attribute here - - ///`i` is arg index + 1 - ///I think that 0 is the return index, but it has a named LLVM constant variable - LLVMZigAddNonNullAttr(fn_table_entry->fn_value, param_decl_i + 1); + LLVMZigAddNonNullAttr(fn_table_entry->fn_value, gen_index + 1); } if (is_byval) { // TODO diff --git a/src/zig_llvm.hpp b/src/zig_llvm.hpp index d4e3548b70..aa50cddaa1 100644 --- a/src/zig_llvm.hpp +++ b/src/zig_llvm.hpp @@ -39,6 +39,7 @@ void LLVMZigOptimizeModule(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef LLVMValueRef LLVMZigBuildCall(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args, unsigned NumArgs, unsigned CC, const char *Name); +// 0 is return value, 1 is first arg void LLVMZigAddNonNullAttr(LLVMValueRef fn, unsigned i); LLVMZigDIType *LLVMZigCreateDebugPointerType(LLVMZigDIBuilder *dibuilder, LLVMZigDIType *pointee_type,