authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-03 03:32:45-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-03 03:32:45-07:00
logafdb47c32d00db3777352fb745b277b5d0805c69
tree3aa1bb1dfbacd6b29084e295ed6f2f4c7c6dab65
parent815d9a79948ce5c68b8522e3bcf86c91abffb145

fix debug symbols for byval arguments

3 files changed, 14 insertions(+), 15 deletions(-)

src/all_types.hpp+1
......@@ -874,6 +874,7 @@ struct FnGenParamInfo {
874874 int src_index;
875875 int gen_index;
876876 bool is_byval;
877 TypeTableEntry *type;
877878};
878879
879880struct TypeTableEntryFn {
src/analyze.cpp+1
......@@ -590,6 +590,7 @@ TypeTableEntry *get_fn_type(CodeGen *g, FnTypeId fn_type_id) {
590590 }
591591 gen_param_types[gen_param_index] = gen_type->type_ref;
592592 gen_param_info->gen_index = gen_param_index;
593 gen_param_info->type = gen_type;
593594
594595 gen_param_index += 1;
595596
src/codegen.cpp+12-15
......@@ -111,16 +111,6 @@ static TypeTableEntry *get_expr_type(AstNode *node) {
111111 return get_resolved_expr(node)->type_entry;
112112}
113113
114static TypeTableEntry *fn_proto_type_from_type_node(CodeGen *g, AstNode *type_node) {
115 TypeTableEntry *type_entry = get_type_for_type_node(type_node);
116
117 if (handle_is_ptr(type_entry)) {
118 return get_pointer_to_type(g, type_entry, true);
119 } else {
120 return type_entry;
121 }
122}
123
124114enum AddSubMul {
125115 AddSubMulAdd = 0,
126116 AddSubMulSub = 1,
......@@ -2774,14 +2764,15 @@ static void do_code_gen(CodeGen *g) {
27742764 continue;
27752765 }
27762766
2777 AstNode *type_node = param_node->data.param_decl.type;
2778 TypeTableEntry *param_type = fn_proto_type_from_type_node(g, type_node);
2767 TypeTableEntry *param_type = info->type;
27792768 LLVMValueRef argument_val = LLVMGetParam(fn_table_entry->fn_value, gen_index);
27802769 bool param_is_noalias = param_node->data.param_decl.is_noalias;
27812770 if (param_type->id == TypeTableEntryIdPointer && param_is_noalias) {
27822771 LLVMAddAttribute(argument_val, LLVMNoAliasAttribute);
27832772 }
2784 if (param_type->id == TypeTableEntryIdPointer && param_type->data.pointer.is_const) {
2773 if ((param_type->id == TypeTableEntryIdPointer && param_type->data.pointer.is_const) ||
2774 is_byval)
2775 {
27852776 LLVMAddAttribute(argument_val, LLVMReadOnlyAttribute);
27862777 }
27872778 if (param_type->id == TypeTableEntryIdPointer) {
......@@ -2789,7 +2780,8 @@ static void do_code_gen(CodeGen *g) {
27892780 // non null attribute here
27902781 }
27912782 if (is_byval) {
2792 LLVMAddAttribute(argument_val, LLVMByValAttribute);
2783 // TODO
2784 //LLVMAddAttribute(argument_val, LLVMByValAttribute);
27932785 }
27942786 }
27952787
......@@ -2847,6 +2839,7 @@ static void do_code_gen(CodeGen *g) {
28472839
28482840 unsigned tag;
28492841 unsigned arg_no;
2842 TypeTableEntry *gen_type;
28502843 if (block_context->node->type == NodeTypeFnDef) {
28512844 tag = LLVMZigTag_DW_arg_variable();
28522845 arg_no = var->gen_arg_index + 1;
......@@ -2854,6 +2847,8 @@ static void do_code_gen(CodeGen *g) {
28542847 var->is_ptr = false;
28552848 assert(var->gen_arg_index >= 0);
28562849 var->value_ref = LLVMGetParam(fn, var->gen_arg_index);
2850
2851 gen_type = fn_table_entry->type_entry->data.fn.gen_param_info[var->src_arg_index].type;
28572852 } else {
28582853 tag = LLVMZigTag_DW_auto_variable();
28592854 arg_no = 0;
......@@ -2862,12 +2857,14 @@ static void do_code_gen(CodeGen *g) {
28622857 var->value_ref = LLVMBuildAlloca(g->builder, var->type->type_ref, buf_ptr(&var->name));
28632858 uint64_t align_bytes = LLVMABISizeOfType(g->target_data_ref, var->type->type_ref);
28642859 LLVMSetAlignment(var->value_ref, align_bytes);
2860
2861 gen_type = var->type;
28652862 }
28662863
28672864 var->di_loc_var = LLVMZigCreateLocalVariable(g->dbuilder, tag,
28682865 block_context->di_scope, buf_ptr(&var->name),
28692866 import->di_file, var->decl_node->line + 1,
2870 var->type->di_type, !g->strip_debug_symbols, 0, arg_no);
2867 gen_type->di_type, !g->strip_debug_symbols, 0, arg_no);
28712868 }
28722869
28732870 // allocate structs which are the result of casts