From 8e836cb59a63449bc4d3e82df4e35f947ceace39 Mon Sep 17 00:00:00 2001 From: Luuk de Gram Date: Sun, 8 Oct 2023 15:18:40 +0200 Subject: [PATCH 1/2] wasm: correctly lower signed value in `@tagName` --- src/arch/wasm/CodeGen.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 49754f03f6..922fc4db07 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -7215,12 +7215,12 @@ fn getTagNameFunction(func: *CodeGen, enum_ty: Type) InnerError!u32 { switch (tag_value) { .imm32 => |value| { try writer.writeByte(std.wasm.opcode(.i32_const)); - try leb.writeULEB128(writer, value); + try leb.writeILEB128(writer, @as(i32, @bitCast(value))); try writer.writeByte(std.wasm.opcode(.i32_ne)); }, .imm64 => |value| { try writer.writeByte(std.wasm.opcode(.i64_const)); - try leb.writeULEB128(writer, value); + try leb.writeILEB128(writer, @as(i64, @bitCast(value))); try writer.writeByte(std.wasm.opcode(.i64_ne)); }, else => unreachable, From 9402f8b74aca76a14c7e9d00fd917e8ae9a02d2f Mon Sep 17 00:00:00 2001 From: Luuk de Gram Date: Sun, 8 Oct 2023 15:23:50 +0200 Subject: [PATCH 2/2] add behavior test `@tagName` with signed values --- test/behavior/enum.zig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/behavior/enum.zig b/test/behavior/enum.zig index 6701381085..13d079ddf9 100644 --- a/test/behavior/enum.zig +++ b/test/behavior/enum.zig @@ -1048,6 +1048,22 @@ test "@tagName on enum literals" { try comptime expect(mem.eql(u8, @tagName(.FooBar), "FooBar")); } +test "tag name with signed enum values" { + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; + if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; + + const LocalFoo = enum(isize) { + alfa = 62, + bravo = 63, + charlie = 64, + delta = 65, + }; + var b = LocalFoo.bravo; + try expect(mem.eql(u8, @tagName(b), "bravo")); +} + test "enum literal casting to optional" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;