| author |  Luuk de Gram <luuk@degram.dev> 2021-05-15 17:32:38+02:00 |
| committer | Luuk de Gram <luuk@degram.dev> 2021-05-19 10:35:45+02:00 |
| log | 141a0cbb5a1ffd9e6c47bf859064139143ed8c51 |
| tree | 712c282ae44f7200741a6a546e51788ce4de0f03 |
| parent | 9ddede2950b5532c652dddca2d0d726d497c3161 |
| signature |  Commit is signed but in an unrecognized format. |
Explicit return & more complex wasm enum test
- When returning within a block, we must use an explicit return opcode. For now always emit the opcode when calling return, rather than using implicit return statements.
- Also added a more comprehensive test case to test for enum values using conditions2 files changed, 24 insertions(+), 1 deletions(-)
src/codegen/wasm.zig+4
| ... | @@ -758,6 +758,7 @@ pub const Context = struct { | ... | @@ -758,6 +758,7 @@ pub const Context = struct { |
| 758 | // TODO: Implement tail calls | 758 | // TODO: Implement tail calls |
| 759 | const operand = self.resolveInst(inst.operand); | 759 | const operand = self.resolveInst(inst.operand); |
| 760 | try self.emitWValue(operand); | 760 | try self.emitWValue(operand); |
| 761 | try self.code.append(wasm.opcode(.@"return")); | ||
| 761 | return .none; | 762 | return .none; |
| 762 | } | 763 | } |
| 763 | 764 | ||
| ... | @@ -903,6 +904,9 @@ pub const Context = struct { | ... | @@ -903,6 +904,9 @@ pub const Context = struct { |
| 903 | if (enum_full.values.count() != 0) { | 904 | if (enum_full.values.count() != 0) { |
| 904 | const tag_val = enum_full.values.entries.items[field_index.data].key; | 905 | const tag_val = enum_full.values.entries.items[field_index.data].key; |
| 905 | try self.emitConstant(src, tag_val, enum_full.tag_ty); | 906 | try self.emitConstant(src, tag_val, enum_full.tag_ty); |
| 907 | } else { | ||
| 908 | try writer.writeByte(wasm.opcode(.i32_const)); | ||
| 909 | try leb.writeULEB128(writer, field_index.data); | ||
| 906 | } | 910 | } |
| 907 | }, | 911 | }, |
| 908 | else => unreachable, | 912 | else => unreachable, |
test/stage2/wasm.zig+20-1
| ... | @@ -391,7 +391,7 @@ pub fn addCases(ctx: *TestContext) !void { | ... | @@ -391,7 +391,7 @@ pub fn addCases(ctx: *TestContext) !void { |
| 391 | case.addCompareOutput( | 391 | case.addCompareOutput( |
| 392 | \\const Number = enum { One, Two, Three }; | 392 | \\const Number = enum { One, Two, Three }; |
| 393 | \\ | 393 | \\ |
| 394 | \\export fn _start() i32 { | 394 | \\pub export fn _start() i32 { |
| 395 | \\ var number1 = Number.One; | 395 | \\ var number1 = Number.One; |
| 396 | \\ var number2: Number = .Two; | 396 | \\ var number2: Number = .Two; |
| 397 | \\ const number3 = @intToEnum(Number, 2); | 397 | \\ const number3 = @intToEnum(Number, 2); |
| ... | @@ -399,5 +399,24 @@ pub fn addCases(ctx: *TestContext) !void { | ... | @@ -399,5 +399,24 @@ pub fn addCases(ctx: *TestContext) !void { |
| 399 | \\ return @enumToInt(number3); | 399 | \\ return @enumToInt(number3); |
| 400 | \\} | 400 | \\} |
| 401 | , "2\n"); | 401 | , "2\n"); |
| 402 | |||
| 403 | case.addCompareOutput( | ||
| 404 | \\const Number = enum { One, Two, Three }; | ||
| 405 | \\ | ||
| 406 | \\pub export fn _start() i32 { | ||
| 407 | \\ var number1 = Number.One; | ||
| 408 | \\ var number2: Number = .Two; | ||
| 409 | \\ const number3 = @intToEnum(Number, 2); | ||
| 410 | \\ if (number1 == number2) return 1; | ||
| 411 | \\ if (number2 == number3) return 1; | ||
| 412 | \\ if (@enumToInt(number1) != 0) return 1; | ||
| 413 | \\ if (@enumToInt(number2) != 1) return 1; | ||
| 414 | \\ if (@enumToInt(number3) != 2) return 1; | ||
| 415 | \\ var x: Number = .Two; | ||
| 416 | \\ if (number2 != x) return 1; | ||
| 417 | \\ | ||
| 418 | \\ return @enumToInt(number3); | ||
| 419 | \\} | ||
| 420 | , "2\n"); | ||
| 402 | } | 421 | } |
| 403 | } | 422 | } |