Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-02-05 20:30:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix slice concatenation

Browse Source 
This was causing an underflow error
This commit is contained in:
Matthew McAllister 2019-02-02 13:57:53 -08:00 committed by Andrew Kelley
parent 9b8e23934b
commit c90c256868
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ir.cpp
View File

@ -12369,7 +12369,7 @@ static IrInstruction *ir_analyze_array_cat(IrAnalyze *ira, IrInstructionBinOp *i
op1_array_val = ptr_val->data.x_ptr.data.base_array.array_val; op1_array_val = ptr_val->data.x_ptr.data.base_array.array_val;
op1_array_index = ptr_val->data.x_ptr.data.base_array.elem_index; op1_array_index = ptr_val->data.x_ptr.data.base_array.elem_index;
ConstExprValue *len_val = &op1_val->data.x_struct.fields[slice_len_index]; ConstExprValue *len_val = &op1_val->data.x_struct.fields[slice_len_index];
op1_array_end = bigint_as_unsigned(&len_val->data.x_bigint); op1_array_end = op1_array_index + bigint_as_unsigned(&len_val->data.x_bigint);
} else { } else {
ir_add_error(ira, op1, ir_add_error(ira, op1,
buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op1->value.type->name))); buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op1->value.type->name)));
@ -12379,13 +12379,9 @@ static IrInstruction *ir_analyze_array_cat(IrAnalyze *ira, IrInstructionBinOp *i
ConstExprValue *op2_array_val; ConstExprValue *op2_array_val;
size_t op2_array_index; size_t op2_array_index;
size_t op2_array_end; size_t op2_array_end;
bool op2_type_valid;
if (op2_type->id == ZigTypeIdArray) { if (op2_type->id == ZigTypeIdArray) {
if (op2_type->data.array.child_type != child_type) { op2_type_valid = op2_type->data.array.child_type == child_type;
ir_add_error(ira, op2, buf_sprintf("expected array of type '%s', found '%s'",
buf_ptr(&child_type->name),
buf_ptr(&op2->value.type->name)));
return ira->codegen->invalid_instruction;
}
op2_array_val = op2_val; op2_array_val = op2_val;
op2_array_index = 0; op2_array_index = 0;
op2_array_end = op2_array_val->type->data.array.len; op2_array_end = op2_array_val->type->data.array.len;
@ -12394,35 +12390,30 @@ static IrInstruction *ir_analyze_array_cat(IrAnalyze *ira, IrInstructionBinOp *i
op2_val->data.x_ptr.special == ConstPtrSpecialBaseArray && op2_val->data.x_ptr.special == ConstPtrSpecialBaseArray &&
op2_val->data.x_ptr.data.base_array.is_cstr) op2_val->data.x_ptr.data.base_array.is_cstr)
{ {
if (child_type != ira->codegen->builtin_types.entry_u8) { op2_type_valid = child_type == ira->codegen->builtin_types.entry_u8;
ir_add_error(ira, op2, buf_sprintf("expected array of type '%s', found '%s'",
buf_ptr(&child_type->name),
buf_ptr(&op2->value.type->name)));
return ira->codegen->invalid_instruction;
}
op2_array_val = op2_val->data.x_ptr.data.base_array.array_val; op2_array_val = op2_val->data.x_ptr.data.base_array.array_val;
op2_array_index = op2_val->data.x_ptr.data.base_array.elem_index; op2_array_index = op2_val->data.x_ptr.data.base_array.elem_index;
op2_array_end = op2_array_val->type->data.array.len - 1; op2_array_end = op2_array_val->type->data.array.len - 1;
} else if (is_slice(op2_type)) { } else if (is_slice(op2_type)) {
ZigType *ptr_type = op2_type->data.structure.fields[slice_ptr_index].type_entry; ZigType *ptr_type = op2_type->data.structure.fields[slice_ptr_index].type_entry;
if (ptr_type->data.pointer.child_type != child_type) { op2_type_valid = ptr_type->data.pointer.child_type == child_type;
ir_add_error(ira, op2, buf_sprintf("expected array of type '%s', found '%s'",
buf_ptr(&child_type->name),
buf_ptr(&op2->value.type->name)));
return ira->codegen->invalid_instruction;
}
ConstExprValue *ptr_val = &op2_val->data.x_struct.fields[slice_ptr_index]; ConstExprValue *ptr_val = &op2_val->data.x_struct.fields[slice_ptr_index];
assert(ptr_val->data.x_ptr.special == ConstPtrSpecialBaseArray); assert(ptr_val->data.x_ptr.special == ConstPtrSpecialBaseArray);
op2_array_val = ptr_val->data.x_ptr.data.base_array.array_val; op2_array_val = ptr_val->data.x_ptr.data.base_array.array_val;
op2_array_index = ptr_val->data.x_ptr.data.base_array.elem_index; op2_array_index = ptr_val->data.x_ptr.data.base_array.elem_index;
op2_array_end = op2_array_val->type->data.array.len;
ConstExprValue *len_val = &op2_val->data.x_struct.fields[slice_len_index]; ConstExprValue *len_val = &op2_val->data.x_struct.fields[slice_len_index];
op2_array_end = bigint_as_unsigned(&len_val->data.x_bigint); op2_array_end = op2_array_index + bigint_as_unsigned(&len_val->data.x_bigint);
} else { } else {
ir_add_error(ira, op2, ir_add_error(ira, op2,
buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op2->value.type->name))); buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op2->value.type->name)));
return ira->codegen->invalid_instruction; return ira->codegen->invalid_instruction;
} }
if (!op2_type_valid) {
ir_add_error(ira, op2, buf_sprintf("expected array of type '%s', found '%s'",
buf_ptr(&child_type->name),
buf_ptr(&op2->value.type->name)));
return ira->codegen->invalid_instruction;
}
// The type of result is populated in the following if blocks // The type of result is populated in the following if blocks
IrInstruction *result = ir_const(ira, &instruction->base, nullptr); IrInstruction *result = ir_const(ira, &instruction->base, nullptr);

4
test/stage1/behavior/eval.zig
View File

@ -728,8 +728,8 @@ test "comptime pointer cast array and then slice" {
test "slice bounds in comptime concatenation" { test "slice bounds in comptime concatenation" {
const bs = comptime blk: { const bs = comptime blk: {
const b = c"11"; const b = c"........1........";
break :blk b[0..1]; break :blk b[8..9];
}; };
const str = "" ++ bs; const str = "" ++ bs;
assertOrPanic(str.len == 1); assertOrPanic(str.len == 1);