authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-17 23:32:03-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-19 09:53:55-04:00
log72a261b4d35b4f720e189150eb5e73e0fa52ae35
tree99cdde55c436f2e443cfdd00ad7c808556b3a733
parent4435b05b6b007df9159058fb5ae6f8902eecd1d8
signaturelock-open Commit is signed but in an unrecognized format.

fix runtime slice of pointer not setting length

1 files changed, 7 insertions(+), 0 deletions(-)

src/codegen.cpp+7
...@@ -5530,9 +5530,16 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutableGen *executable, IrI...@@ -5530,9 +5530,16 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutableGen *executable, IrI
5530 }5530 }
55315531
5532 LLVMValueRef tmp_struct_ptr = ir_llvm_value(g, instruction->result_loc);5532 LLVMValueRef tmp_struct_ptr = ir_llvm_value(g, instruction->result_loc);
5533
5533 size_t gen_ptr_index = result_type->data.structure.fields[slice_ptr_index]->gen_index;5534 size_t gen_ptr_index = result_type->data.structure.fields[slice_ptr_index]->gen_index;
5534 LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, tmp_struct_ptr, gen_ptr_index, "");5535 LLVMValueRef ptr_field_ptr = LLVMBuildStructGEP(g->builder, tmp_struct_ptr, gen_ptr_index, "");
5535 gen_store_untyped(g, slice_start_ptr, ptr_field_ptr, 0, false);5536 gen_store_untyped(g, slice_start_ptr, ptr_field_ptr, 0, false);
5537
5538 size_t gen_len_index = result_type->data.structure.fields[slice_len_index]->gen_index;
5539 LLVMValueRef len_field_ptr = LLVMBuildStructGEP(g->builder, tmp_struct_ptr, gen_len_index, "");
5540 LLVMValueRef len_value = LLVMBuildNSWSub(g->builder, end_val, start_val, "");
5541 gen_store_untyped(g, len_value, len_field_ptr, 0, false);
5542
5536 return tmp_struct_ptr;5543 return tmp_struct_ptr;
55375544
5538 } else if (array_type->id == ZigTypeIdStruct) {5545 } else if (array_type->id == ZigTypeIdStruct) {