diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2023-01-26 08:01:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-26 08:01:51 +0100 |
| commit | 48f9e491cb97de54c7e8d395170d8b4c8ea9a62b (patch) | |
| tree | 1814df5a930afc03f1cadd114ccee2b2204107f1 /src/arch/wasm/CodeGen.zig | |
| parent | 96a55f6ce86dc2e25c275ee3211b2cde0e3d92ab (diff) | |
| parent | a95d58caf289ecc2ab36cdb30437f634c07b64e4 (diff) | |
| download | zig-48f9e491cb97de54c7e8d395170d8b4c8ea9a62b.tar.gz zig-48f9e491cb97de54c7e8d395170d8b4c8ea9a62b.zip | |
Merge pull request #14453 from ziglang/self-hosted-codegen-cleanup
self-hosted: cleanup codegen.Result
Diffstat (limited to 'src/arch/wasm/CodeGen.zig')
| -rw-r--r-- | src/arch/wasm/CodeGen.zig | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index c27639e14a..a7d90a8bf9 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -627,13 +627,6 @@ test "Wasm - buildOpcode" { try testing.expectEqual(@as(wasm.Opcode, .f64_reinterpret_i64), f64_reinterpret_i64); } -pub const Result = union(enum) { - /// The codegen bytes have been appended to `Context.code` - appended: void, - /// The data is managed externally and are part of the `Result` - externally_managed: []const u8, -}; - /// Hashmap to store generated `WValue` for each `Air.Inst.Ref` pub const ValueTable = std.AutoArrayHashMapUnmanaged(Air.Inst.Ref, WValue); @@ -1171,7 +1164,7 @@ pub fn generate( liveness: Liveness, code: *std.ArrayList(u8), debug_output: codegen.DebugInfoOutput, -) codegen.GenerateSymbolError!codegen.FnResult { +) codegen.GenerateSymbolError!codegen.Result { _ = src_loc; var code_gen: CodeGen = .{ .gpa = bin_file.allocator, @@ -1190,11 +1183,11 @@ pub fn generate( defer code_gen.deinit(); genFunc(&code_gen) catch |err| switch (err) { - error.CodegenFail => return codegen.FnResult{ .fail = code_gen.err_msg }, + error.CodegenFail => return codegen.Result{ .fail = code_gen.err_msg }, else => |e| return e, }; - return codegen.FnResult{ .appended = {} }; + return codegen.Result.ok; } fn genFunc(func: *CodeGen) InnerError!void { |
