From 1a05b545205863c6bf9cbdee9157ad0c440300ca Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 18 Jan 2021 14:12:05 -0700 Subject: update wasm backend to match new Module API Fixes a logical merge conflict that I didn't notice before. --- src/codegen/wasm.zig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/codegen/wasm.zig b/src/codegen/wasm.zig index 70e9de7baf..cbb2a42189 100644 --- a/src/codegen/wasm.zig +++ b/src/codegen/wasm.zig @@ -57,16 +57,19 @@ pub const Context = struct { /// will have the index that comes after the last argument's index local_index: u32 = 0, /// If codegen fails, an error messages will be allocated and saved in `err_msg` - err_msg: *Compilation.ErrorMsg, + err_msg: *Module.ErrorMsg, const InnerError = error{ OutOfMemory, CodegenFail, }; - /// Sets `err_msg` on `Context` and returns `error.CodegemFail` which is caught in link/Wasm.zig + /// Sets `err_msg` on `Context` and returns `error.CodegenFail` which is caught in link/Wasm.zig fn fail(self: *Context, src: usize, comptime fmt: []const u8, args: anytype) InnerError { - self.err_msg = try Compilation.ErrorMsg.create(self.gpa, src, fmt, args); + self.err_msg = try Module.ErrorMsg.create(self.gpa, .{ + .file_scope = self.decl.getFileScope(), + .byte_offset = src, + }, fmt, args); return error.CodegenFail; } -- cgit v1.2.3