authorgravatar for luuk@degram.devLuuk de Gram <luuk@degram.dev> 2022-03-08 20:04:49+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-09 13:53:10-07:00
logf931c0638da6b0935de31044be93c8ab1387e04e
tree1d27b6e8b1dafd02bcffbb36ce8fc478f8504627
parentd01bfa032dd21a2464ca6be850053f68387acea8

wasm: Implement `errunion_payload_ptr_set`

This also fixes `ret_ptr` where the pointee type is zero-sized.

1 files changed, 28 insertions(+), 2 deletions(-)

src/arch/wasm/CodeGen.zig+28-2
......@@ -1277,6 +1277,7 @@ fn genInst(self: *Self, inst: Air.Inst.Index) !WValue {
12771277 .unwrap_errunion_err => self.airUnwrapErrUnionError(inst),
12781278 .wrap_errunion_payload => self.airWrapErrUnionPayload(inst),
12791279 .wrap_errunion_err => self.airWrapErrUnionErr(inst),
1280 .errunion_payload_ptr_set => self.airErrUnionPayloadPtrSet(inst),
12801281
12811282 .wasm_memory_size => self.airWasmMemorySize(inst),
12821283 .wasm_memory_grow => self.airWasmMemoryGrow(inst),
......@@ -1333,7 +1334,6 @@ fn genInst(self: *Self, inst: Air.Inst.Index) !WValue {
13331334 .atomic_rmw,
13341335 .tag_name,
13351336 .error_name,
1336 .errunion_payload_ptr_set,
13371337 .field_parent_ptr,
13381338 .mul_add,
13391339
......@@ -1372,7 +1372,10 @@ fn airRet(self: *Self, inst: Air.Inst.Index) InnerError!WValue {
13721372
13731373fn airRetPtr(self: *Self, inst: Air.Inst.Index) InnerError!WValue {
13741374 const child_type = self.air.typeOfIndex(inst).childType();
1375 if (child_type.abiSize(self.target) == 0) return WValue{ .none = {} };
1375
1376 if (!child_type.isFnOrHasRuntimeBits()) {
1377 return self.allocStack(Type.usize); // create pointer to void
1378 }
13761379
13771380 if (isByRef(child_type, self.target)) {
13781381 return self.return_value;
......@@ -3226,3 +3229,26 @@ fn airFptrunc(self: *Self, inst: Air.Inst.Index) InnerError!WValue {
32263229 return self.fail("TODO: Implement 'fptrunc' for floats with bitsize: {d}", .{dest_bits});
32273230 }
32283231}
3232
3233fn airErrUnionPayloadPtrSet(self: *Self, inst: Air.Inst.Index) InnerError!WValue {
3234 const ty_op = self.air.instructions.items(.data)[inst].ty_op;
3235 const err_set_ty = self.air.typeOf(ty_op.operand).childType();
3236 const err_ty = err_set_ty.errorUnionSet();
3237 const payload_ty = err_set_ty.errorUnionPayload();
3238 const operand = try self.resolveInst(ty_op.operand);
3239
3240 // set error-tag to '0' to annotate error union is non-error
3241 try self.store(operand, .{ .imm32 = 0 }, err_ty, 0);
3242
3243 if (self.liveness.isUnused(inst)) return WValue{ .none = {} };
3244
3245 if (!payload_ty.hasRuntimeBits()) {
3246 return operand;
3247 }
3248
3249 const err_align = err_set_ty.abiAlignment(self.target);
3250 const set_size = err_ty.abiSize(self.target);
3251 const offset = mem.alignForwardGeneric(u64, set_size, err_align);
3252
3253 return self.buildPointerOffset(operand, @intCast(u32, offset), .new);
3254}