mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

stage2: out of bounds error for slicing

Browse source
This commit is contained in:
Mitchell Hashimoto 2022-03-20 20:04:18 -07:00 • committed by Andrew Kelley
parent 0fb005d1d0
commit 91fd0f42c8
3 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Sema.zig
View file

@ -19587,6 +19587,14 @@ fn analyzeSlice(
if (!end_is_len) { if (!end_is_len) {
const end = try sema.coerce(block, Type.usize, uncasted_end_opt, end_src); const end = try sema.coerce(block, Type.usize, uncasted_end_opt, end_src);
if (try sema.resolveMaybeUndefVal(block, end_src, end)) |end_val| { if (try sema.resolveMaybeUndefVal(block, end_src, end)) |end_val| {
if (end_val.compare(.gt, len_val, Type.usize)) {
return sema.fail(
block,
end_src,
"end index {} out of bounds for array of length {}",
.{ end_val.fmtValue(Type.usize), len_val.fmtValue(Type.usize) },
);
}
if (end_val.eql(len_val, Type.usize)) { if (end_val.eql(len_val, Type.usize)) {
end_is_len = true; end_is_len = true;
} }
@ -19605,6 +19613,14 @@ fn analyzeSlice(
.data = slice_val.sliceLen(), .data = slice_val.sliceLen(),
}; };
const slice_len_val = Value.initPayload(&int_payload.base); const slice_len_val = Value.initPayload(&int_payload.base);
if (end_val.compare(.gt, slice_len_val, Type.usize)) {
return sema.fail(
block,
end_src,
"end index {} out of bounds for slice of length {}",
.{ end_val.fmtValue(Type.usize), slice_len_val.fmtValue(Type.usize) },
);
}
if (end_val.eql(slice_len_val, Type.usize)) { if (end_val.eql(slice_len_val, Type.usize)) {
end_is_len = true; end_is_len = true;
} }
@ -19635,6 +19651,20 @@ fn analyzeSlice(
break :s null; break :s null;
}; };
// requirement: start <= end
if (try sema.resolveDefinedValue(block, src, end)) |end_val| {
if (try sema.resolveDefinedValue(block, src, start)) |start_val| {
if (start_val.compare(.gt, end_val, Type.usize)) {
return sema.fail(
block,
start_src,
"start index {} is larger than end index {}",
.{ start_val.fmtValue(Type.usize), end_val.fmtValue(Type.usize) },
);
}
}
}
const new_len = try sema.analyzeArithmetic(block, .sub, end, start, src, end_src, start_src); const new_len = try sema.analyzeArithmetic(block, .sub, end, start, src, end_src, start_src);
const opt_new_len_val = try sema.resolveDefinedValue(block, src, new_len); const opt_new_len_val = try sema.resolveDefinedValue(block, src, new_len);

6
test/behavior/cast.zig
View file

@ -906,7 +906,11 @@ test "peer cast [*:x]T to [*]T" {
} }
test "peer cast [:x]T to [*:x]T" { test "peer cast [:x]T to [*:x]T" {
if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
const S = struct { const S = struct {
fn doTheTest() !void { fn doTheTest() !void {

23
test/compile_errors.zig
View file

@ -21,6 +21,29 @@ pub fn addCases(ctx: *TestContext) !void {
, &[_][]const u8{ , &[_][]const u8{
":2:20: error: import of file outside package path: '../../above.zig'", ":2:20: error: import of file outside package path: '../../above.zig'",
}); });
case.addError(
\\comptime {
\\ var array = [_:0]u8{ 1, 2, 3, 4 };
\\ var src_slice: [:0]u8 = &array;
\\ var slice = src_slice[2..5];
\\ _ = slice;
\\}
\\comptime {
\\ var array = [_:0]u8{ 1, 2, 3, 4 };
\\ var slice = array[2..5];
\\ _ = slice;
\\}
\\comptime {
\\ var array = [_:0]u8{ 1, 2, 3, 4 };
\\ var slice = array[3..2];
\\ _ = slice;
\\}
, &[_][]const u8{
":4:26: error: end index 5 out of bounds for slice of length 4",
":9:22: error: end index 5 out of bounds for array of length 4",
":14:22: error: start index 3 is larger than end index 2",
});
} }
ctx.objErrStage1("exported enum without explicit integer tag type", ctx.objErrStage1("exported enum without explicit integer tag type",