authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-19 13:18:14-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-19 13:18:14-04:00
log1d7861a36e1bcd8f7bfdb53716ef53467704922b
treea63abc081b671ea77d082d62053af37dcef14aac
parent8ddf9d84ffb208042ae7ea0fb3dc9fbfb2b5c983
signaturelock-open Commit is signed but in an unrecognized format.

fix incorrect sentinel check

4 files changed, 10 insertions(+), 17 deletions(-)

lib/std/crypto/sha2.zig+2-4
......@@ -167,8 +167,7 @@ fn Sha2_32(comptime params: Sha2Params32) type {
167167 const rr = d.s[0 .. params.out_len / 32];
168168
169169 for (rr) |s, j| {
170 // TODO https://github.com/ziglang/zig/issues/863
171 mem.writeIntSliceBig(u32, out[4 * j .. 4 * j + 4], s);
170 mem.writeIntBig(u32, out[4 * j ..][0..4], s);
172171 }
173172 }
174173
......@@ -509,8 +508,7 @@ fn Sha2_64(comptime params: Sha2Params64) type {
509508 const rr = d.s[0 .. params.out_len / 64];
510509
511510 for (rr) |s, j| {
512 // TODO https://github.com/ziglang/zig/issues/863
513 mem.writeIntSliceBig(u64, out[8 * j .. 8 * j + 8], s);
511 mem.writeIntBig(u64, out[8 * j ..][0..8], s);
514512 }
515513 }
516514
src/all_types.hpp+1
......@@ -3711,6 +3711,7 @@ struct IrInstGenSlice {
37113711 IrInstGen *start;
37123712 IrInstGen *end;
37133713 IrInstGen *result_loc;
3714 ZigValue *sentinel;
37143715 bool safety_check_on;
37153716};
37163717
src/codegen.cpp+3-11
......@@ -5425,17 +5425,9 @@ static LLVMValueRef ir_render_slice(CodeGen *g, IrExecutableGen *executable, IrI
54255425 return nullptr;
54265426 }
54275427
5428 ZigValue *sentinel = nullptr;
5429 if (result_type->id == ZigTypeIdPointer) {
5430 ZigType *result_array_type = result_type->data.pointer.child_type;
5431 ir_assert(result_array_type->id == ZigTypeIdArray, &instruction->base);
5432 sentinel = result_array_type->data.array.sentinel;
5433 } else if (result_type->id == ZigTypeIdStruct) {
5434 ZigType *res_slice_ptr_type = result_type->data.structure.fields[slice_ptr_index]->type_entry;
5435 sentinel = res_slice_ptr_type->data.pointer.sentinel;
5436 } else {
5437 zig_unreachable();
5438 }
5428 // This is not whether the result type has a sentinel, but whether there should be a sentinel check,
5429 // e.g. if they used [a..b :s] syntax.
5430 ZigValue *sentinel = instruction->sentinel;
54395431
54405432 if (array_type->id == ZigTypeIdArray ||
54415433 (array_type->id == ZigTypeIdPointer && array_type->data.pointer.ptr_len == PtrLenSingle))
src/ir.cpp+4-2
......@@ -3732,7 +3732,8 @@ static IrInstSrc *ir_build_slice_src(IrBuilderSrc *irb, Scope *scope, AstNode *s
37323732}
37333733
37343734static IrInstGen *ir_build_slice_gen(IrAnalyze *ira, IrInst *source_instruction, ZigType *slice_type,
3735 IrInstGen *ptr, IrInstGen *start, IrInstGen *end, bool safety_check_on, IrInstGen *result_loc)
3735 IrInstGen *ptr, IrInstGen *start, IrInstGen *end, bool safety_check_on, IrInstGen *result_loc,
3736 ZigValue *sentinel)
37363737{
37373738 IrInstGenSlice *instruction = ir_build_inst_gen<IrInstGenSlice>(
37383739 &ira->new_irb, source_instruction->scope, source_instruction->source_node);
......@@ -3742,6 +3743,7 @@ static IrInstGen *ir_build_slice_gen(IrAnalyze *ira, IrInst *source_instruction,
37423743 instruction->end = end;
37433744 instruction->safety_check_on = safety_check_on;
37443745 instruction->result_loc = result_loc;
3746 instruction->sentinel = sentinel;
37453747
37463748 ir_ref_inst_gen(ptr, ira->new_irb.current_basic_block);
37473749 ir_ref_inst_gen(start, ira->new_irb.current_basic_block);
......@@ -26667,7 +26669,7 @@ done_with_return_type:
2666726669 }
2666826670
2666926671 return ir_build_slice_gen(ira, &instruction->base.base, return_type, ptr_ptr,
26670 casted_start, end, instruction->safety_check_on, result_loc);
26672 casted_start, end, instruction->safety_check_on, result_loc, sentinel_val);
2667126673}
2667226674
2667326675static IrInstGen *ir_analyze_instruction_has_field(IrAnalyze *ira, IrInstSrcHasField *instruction) {