authorgravatar for mitchell.hashimoto@gmail.comMitchell Hashimoto <mitchell.hashimoto@gmail.com> 2022-02-27 19:00:16-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-02-28 20:42:13-07:00
logb4ce8557884bd8f2b3fa621c3564f9d0ff789699
treecca72056f4eb39aabb787a0e3744ec7c6db7f167
parent38aae2cb7cc1dfa906336392a422153b9a345401

stage2: error union and non-error set/union peer cast resolution

2 files changed, 84 insertions(+), 20 deletions(-)

src/Sema.zig+53-20
...@@ -17814,8 +17814,8 @@ fn resolvePeerTypes(...@@ -17814,8 +17814,8 @@ fn resolvePeerTypes(
17814 err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty);17814 err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty);
17815 continue;17815 continue;
17816 },17816 },
17817 .ErrorUnion => {17817 .ErrorUnion => switch (chosen_ty_tag) {
17818 if (chosen_ty_tag == .ErrorSet) {17818 .ErrorSet => {
17819 if (err_set_ty.?.isAnyError()) {17819 if (err_set_ty.?.isAnyError()) {
17820 chosen = candidate;17820 chosen = candidate;
17821 chosen_i = candidate_i + 1;17821 chosen_i = candidate_i + 1;
...@@ -17854,9 +17854,9 @@ fn resolvePeerTypes(...@@ -17854,9 +17854,9 @@ fn resolvePeerTypes(
17854 chosen = candidate;17854 chosen = candidate;
17855 chosen_i = candidate_i + 1;17855 chosen_i = candidate_i + 1;
17856 continue;17856 continue;
17857 }17857 },
1785817858
17859 if (chosen_ty_tag == .ErrorUnion) {17859 .ErrorUnion => {
17860 const chosen_payload_ty = chosen_ty.errorUnionPayload();17860 const chosen_payload_ty = chosen_ty.errorUnionPayload();
17861 const candidate_payload_ty = candidate_ty.errorUnionPayload();17861 const candidate_payload_ty = candidate_ty.errorUnionPayload();
1786217862
...@@ -17926,30 +17926,57 @@ fn resolvePeerTypes(...@@ -17926,30 +17926,57 @@ fn resolvePeerTypes(
17926 err_set_ty = try chosen_set_ty.errorSetMerge(sema.arena, candidate_ty);17926 err_set_ty = try chosen_set_ty.errorSetMerge(sema.arena, candidate_ty);
17927 continue;17927 continue;
17928 }17928 }
17929 }17929 },
1793017930
17931 const payload_ty = candidate_ty.errorUnionPayload();17931 .Pointer => {
17932 if (chosen_ty_tag == .Pointer and17932 const payload_ty = candidate_ty.errorUnionPayload();
17933 chosen_ty.ptrSize() == .One and17933 if (chosen_ty.ptrSize() == .One and
17934 chosen_ty.childType().zigTypeTag() == .Array and17934 chosen_ty.childType().zigTypeTag() == .Array and
17935 payload_ty.isSlice())17935 payload_ty.isSlice())
17936 {17936 {
17937 const chosen_child_ty = chosen_ty.childType();17937 const chosen_child_ty = chosen_ty.childType();
17938 const chosen_elem_ty = chosen_child_ty.elemType2();17938 const chosen_elem_ty = chosen_child_ty.elemType2();
17939 const candidate_elem_ty = payload_ty.elemType2();17939 const candidate_elem_ty = payload_ty.elemType2();
17940 if ((try sema.coerceInMemoryAllowed(block, candidate_elem_ty, chosen_elem_ty, false, target, src, src)) == .ok) {17940 if ((try sema.coerceInMemoryAllowed(block, candidate_elem_ty, chosen_elem_ty, false, target, src, src)) == .ok) {
17941 chosen = candidate;
17942 chosen_i = candidate_i + 1;
17943
17944 convert_to_slice = false; // it already is a slice
17945
17946 // If the prev pointer is const then we need to const
17947 if (chosen_child_ty.isConstPtr())
17948 make_the_slice_const = true;
17949
17950 continue;
17951 }
17952 }
17953 },
17954
17955 else => {
17956 // Chosen coercing into payload type
17957 // Then merge error sets (if any)
17958 const payload_ty = candidate_ty.errorUnionPayload();
17959 if ((try sema.coerceInMemoryAllowed(block, payload_ty, chosen_ty, false, target, src, src)) == .ok) {
17941 chosen = candidate;17960 chosen = candidate;
17942 chosen_i = candidate_i + 1;17961 chosen_i = candidate_i + 1;
1794317962
17944 convert_to_slice = false; // it already is a slice17963 if (err_set_ty) |ty| {
17964 const cand_set_ty = candidate_ty.errorUnionSet();
17965 if (cand_set_ty.castTag(.error_set_inferred)) |inferred| {
17966 try sema.resolveInferredErrorSet(inferred.data);
17967 }
17968 if (cand_set_ty.isAnyError()) {
17969 err_set_ty = cand_set_ty;
17970 continue;
17971 }
17972 if (ty.isAnyError()) continue;
1794517973
17946 // If the prev pointer is const then we need to const17974 err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, cand_set_ty);
17947 if (chosen_child_ty.isConstPtr())17975 }
17948 make_the_slice_const = true;
1794917976
17950 continue;17977 continue;
17951 }17978 }
17952 }17979 },
17953 },17980 },
17954 .Pointer => {17981 .Pointer => {
17955 if (candidate_ty.ptrSize() == .C) {17982 if (candidate_ty.ptrSize() == .C) {
...@@ -18115,6 +18142,12 @@ fn resolvePeerTypes(...@@ -18115,6 +18142,12 @@ fn resolvePeerTypes(
18115 continue;18142 continue;
18116 }18143 }
18117 },18144 },
18145 .ErrorUnion => {
18146 const payload_ty = chosen_ty.errorUnionPayload();
18147 if ((try sema.coerceInMemoryAllowed(block, payload_ty, candidate_ty, false, target, src, src)) == .ok) {
18148 continue;
18149 }
18150 },
18118 else => {},18151 else => {},
18119 }18152 }
1812018153
test/behavior/cast.zig+31
...@@ -705,6 +705,37 @@ test "peer type resolution: error union and error set" {...@@ -705,6 +705,37 @@ test "peer type resolution: error union and error set" {
705 }705 }
706}706}
707707
708test "peer type resolution: error union after non-error" {
709 const a: u32 = undefined;
710 const b: error{ One, Two }!u32 = undefined;
711
712 // note: order of error set members doesn't member, may want to sort
713
714 {
715 const ty = @TypeOf(a, b);
716 const info = @typeInfo(ty);
717 try expect(info == .ErrorUnion);
718 try expect(info.ErrorUnion.payload == u32);
719
720 const error_set_info = @typeInfo(info.ErrorUnion.error_set);
721 try expect(error_set_info.ErrorSet.?.len == 2);
722 try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "One"));
723 try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "Two"));
724 }
725
726 {
727 const ty = @TypeOf(b, a);
728 const info = @typeInfo(ty);
729 try expect(info == .ErrorUnion);
730 try expect(info.ErrorUnion.payload == u32);
731
732 const error_set_info = @typeInfo(info.ErrorUnion.error_set);
733 try expect(error_set_info.ErrorSet.?.len == 2);
734 try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "One"));
735 try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "Two"));
736 }
737}
738
708test "peer cast *[0]T to E![]const T" {739test "peer cast *[0]T to E![]const T" {
709 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;740 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
710 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO741 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO