motiejus/zig
1
Fork 0
Code Releases Activity

stage2: sentinel comp during peer type resolution should use elem type

Browse Source 
We were using the array type, not the element type. Also, we should do
the sentinel comparison after we verify that the element types of both
are compatible.
This commit is contained in:
Mitchell Hashimoto
2022-02-28 10:08:26 -08:00
committed by Andrew Kelley
parent d1a4654834
commit a7ca40b281
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Sema.zig
View File

@@ -17783,21 +17783,18 @@ fn resolvePeerTypes(
const chosen_child_ty = chosen_ty.childType();
const candidate_child_ty = candidate_ty.childType();
if (chosen_child_ty.zigTypeTag() == .Array and candidate_child_ty.zigTypeTag() == .Array) {
// If there is a sentinel, it must match
if (chosen_child_ty.sentinel()) |chosen_sentinel| {
if (candidate_child_ty.sentinel()) |candidate_sentinel| {
if (!chosen_sentinel.eql(candidate_sentinel, chosen_child_ty)) {
continue;
}
} else {
continue;
}
}
// If we can cerce the element types, then we can do this.
const chosen_elem_ty = chosen_child_ty.elemType2();
const candidate_elem_ty = candidate_child_ty.elemType2();
if ((try sema.coerceInMemoryAllowed(block, candidate_elem_ty, chosen_elem_ty, false, target, src, src)) == .ok) {
// If there is a sentinel, it must match
if (chosen_child_ty.sentinel()) |chosen_sentinel| {
if (candidate_child_ty.sentinel()) |candidate_sentinel| {
if (!chosen_sentinel.eql(candidate_sentinel, chosen_elem_ty))
continue;
} else continue;
}
chosen = candidate;
chosen_i = candidate_i + 1;

6
test/behavior/cast.zig
View File

@@ -655,7 +655,11 @@ test "peer cast *[N]T to [*]T" {
}
test "peer resolution of string literals" {
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 E = enum { a, b, c, d };