diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-09-21 15:40:02 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-09-21 15:45:13 -0400 |
| commit | 9e5cd43e6d2caaaa2226be56c0886d73a200e78b (patch) | |
| tree | dc4ea1a95ed0328c68f4a57db9f54d70ccc561f9 /src | |
| parent | 0ca12ded2ffbbc6f703d66541481bab5d8cbb2e3 (diff) | |
| download | zig-9e5cd43e6d2caaaa2226be56c0886d73a200e78b.tar.gz zig-9e5cd43e6d2caaaa2226be56c0886d73a200e78b.zip | |
fix comptime string concatenation ignoring slice bounds
closes #1362
Diffstat (limited to 'src')
| -rw-r--r-- | src/ir.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/ir.cpp b/src/ir.cpp index 5e0f79ec13..c9bc4a48ef 100644 --- a/src/ir.cpp +++ b/src/ir.cpp @@ -12399,7 +12399,8 @@ static ZigType *ir_analyze_array_cat(IrAnalyze *ira, IrInstructionBinOp *instruc assert(ptr_val->data.x_ptr.special == ConstPtrSpecialBaseArray); 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_end = op1_array_val->type->data.array.len; + ConstExprValue *len_val = &op1_val->data.x_struct.fields[slice_len_index]; + op1_array_end = bigint_as_unsigned(&len_val->data.x_bigint); } else { ir_add_error(ira, op1, buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op1->value.type->name))); @@ -12446,6 +12447,8 @@ static ZigType *ir_analyze_array_cat(IrAnalyze *ira, IrInstructionBinOp *instruc 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_end = op2_array_val->type->data.array.len; + ConstExprValue *len_val = &op2_val->data.x_struct.fields[slice_len_index]; + op2_array_end = bigint_as_unsigned(&len_val->data.x_bigint); } else { ir_add_error(ira, op2, buf_sprintf("expected array or C string literal, found '%s'", buf_ptr(&op2->value.type->name))); |
