authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2023-08-27 17:28:37+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-08-28 12:33:36-07:00
logb8e6c426887e92cc5a841a7dd58eb10ebfbe0d77
treebda2f894bffbc95f62920f94121bf0f4e33cfae5
parent8d036d1d78bd6db5fd39b30c6182196c1e49a3db

compiler: provide result type for @memset value

Resolves: #16986

5 files changed, 49 insertions(+), 2 deletions(-)

src/AstGen.zig+6-2
......@@ -2441,6 +2441,7 @@ fn addEnsureResult(gz: *GenZir, maybe_unused_result: Zir.Inst.Ref, statement: As
24412441 .array_type_sentinel,
24422442 .elem_type_index,
24432443 .elem_type,
2444 .indexable_ptr_elem_type,
24442445 .vector_elem_type,
24452446 .vector_type,
24462447 .indexable_ptr_len,
......@@ -8302,9 +8303,12 @@ fn builtinCall(
83028303 return rvalue(gz, ri, .void_value, node);
83038304 },
83048305 .memset => {
8306 const lhs = try expr(gz, scope, .{ .rl = .none }, params[0]);
8307 const lhs_ty = try gz.addUnNode(.typeof, lhs, params[0]);
8308 const elem_ty = try gz.addUnNode(.indexable_ptr_elem_type, lhs_ty, params[0]);
83058309 _ = try gz.addPlNode(.memset, node, Zir.Inst.Bin{
8306 .lhs = try expr(gz, scope, .{ .rl = .none }, params[0]),
8307 .rhs = try expr(gz, scope, .{ .rl = .none }, params[1]),
8310 .lhs = lhs,
8311 .rhs = try expr(gz, scope, .{ .rl = .{ .coerced_ty = elem_ty } }, params[1]),
83088312 });
83098313 return rvalue(gz, ri, .void_value, node);
83108314 },
src/Sema.zig+17
......@@ -1023,6 +1023,7 @@ fn analyzeBodyInner(
10231023 .elem_val_node => try sema.zirElemValNode(block, inst),
10241024 .elem_type_index => try sema.zirElemTypeIndex(block, inst),
10251025 .elem_type => try sema.zirElemType(block, inst),
1026 .indexable_ptr_elem_type => try sema.zirIndexablePtrElemType(block, inst),
10261027 .vector_elem_type => try sema.zirVectorElemType(block, inst),
10271028 .enum_literal => try sema.zirEnumLiteral(block, inst),
10281029 .int_from_enum => try sema.zirIntFromEnum(block, inst),
......@@ -8106,6 +8107,22 @@ fn zirElemType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
81068107 return Air.internedToRef(ptr_ty.childType(mod).toIntern());
81078108}
81088109
8110fn zirIndexablePtrElemType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
8111 const mod = sema.mod;
8112 const un_node = sema.code.instructions.items(.data)[inst].un_node;
8113 const src = un_node.src();
8114 const ptr_ty = sema.resolveType(block, src, un_node.operand) catch |err| switch (err) {
8115 error.GenericPoison => return .generic_poison_type,
8116 else => |e| return e,
8117 };
8118 try sema.checkMemOperand(block, src, ptr_ty);
8119 const elem_ty = switch (ptr_ty.ptrSize(mod)) {
8120 .Slice, .Many, .C => ptr_ty.childType(mod),
8121 .One => ptr_ty.childType(mod).childType(mod),
8122 };
8123 return Air.internedToRef(elem_ty.toIntern());
8124}
8125
81098126fn zirVectorElemType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
81108127 const mod = sema.mod;
81118128 const un_node = sema.code.instructions.items(.data)[inst].un_node;
src/Zir.zig+7
......@@ -248,6 +248,10 @@ pub const Inst = struct {
248248 /// Given a pointer type, returns its element type.
249249 /// Uses the `un_node` field.
250250 elem_type,
251 /// Given an indexable pointer (slice, many-ptr, single-ptr-to-array), returns its
252 /// element type. Emits a compile error if the type is not an indexable pointer.
253 /// Uses the `un_node` field.
254 indexable_ptr_elem_type,
251255 /// Given a vector type, returns its element type.
252256 /// Uses the `un_node` field.
253257 vector_elem_type,
......@@ -1021,6 +1025,7 @@ pub const Inst = struct {
10211025 .vector_type,
10221026 .elem_type_index,
10231027 .elem_type,
1028 .indexable_ptr_elem_type,
10241029 .vector_elem_type,
10251030 .indexable_ptr_len,
10261031 .anyframe_type,
......@@ -1325,6 +1330,7 @@ pub const Inst = struct {
13251330 .vector_type,
13261331 .elem_type_index,
13271332 .elem_type,
1333 .indexable_ptr_elem_type,
13281334 .vector_elem_type,
13291335 .indexable_ptr_len,
13301336 .anyframe_type,
......@@ -1557,6 +1563,7 @@ pub const Inst = struct {
15571563 .vector_type = .pl_node,
15581564 .elem_type_index = .bin,
15591565 .elem_type = .un_node,
1566 .indexable_ptr_elem_type = .un_node,
15601567 .vector_elem_type = .un_node,
15611568 .indexable_ptr_len = .un_node,
15621569 .anyframe_type = .un_node,
src/print_zir.zig+1
......@@ -154,6 +154,7 @@ const Writer = struct {
154154 .alloc_mut,
155155 .alloc_comptime_mut,
156156 .elem_type,
157 .indexable_ptr_elem_type,
157158 .vector_elem_type,
158159 .indexable_ptr_len,
159160 .anyframe_type,
test/behavior/memset.zig+18
......@@ -135,3 +135,21 @@ test "memset with large array element, comptime known" {
135135 for (buf[3]) |elem| try expect(elem == 0);
136136 for (buf[4]) |elem| try expect(elem == 0);
137137}
138
139test "@memset provides result type" {
140 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
141 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
142 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
143 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
144
145 const S = struct { x: u32 };
146
147 var buf1: [5]S = undefined;
148 @memset(&buf1, .{ .x = @intCast(12) });
149
150 var buf2: [5]S = undefined;
151 @memset(@as([]S, &buf2), .{ .x = @intCast(34) });
152
153 for (buf1) |s| try expect(s.x == 12);
154 for (buf2) |s| try expect(s.x == 34);
155}