| author |  Ryan Liptak <squeek502@hotmail.com> 2025-10-01 01:57:01-07:00 |
| committer | Ryan Liptak <squeek502@hotmail.com> 2025-10-01 07:48:33-07:00 |
| log | c50aa2b95c31d00ee0a56e9c774d77a785708e84 |
| tree | cc6ddaabd7d8686d741e58945aa84676181251a6 |
| parent | fc59870e3be6da38ce62efa0f68b157c50589eea |
resinator: Sync with upstream, fix an alignment problem
2 files changed, 3 insertions(+), 5 deletions(-)
lib- compiler
- resinator
lib/compiler/resinator/compile.zig+1-1
| ... | @@ -695,7 +695,7 @@ pub const Compiler = struct { | ... | @@ -695,7 +695,7 @@ pub const Compiler = struct { |
| 695 | } | 695 | } |
| 696 | 696 | ||
| 697 | try file_reader.seekTo(entry.data_offset_from_start_of_file); | 697 | try file_reader.seekTo(entry.data_offset_from_start_of_file); |
| 698 | var header_bytes = (file_reader.interface.takeArray(16) catch { | 698 | var header_bytes: [16]u8 align(@alignOf(ico.BitmapHeader)) = (file_reader.interface.takeArray(16) catch { |
| 699 | return self.iconReadError( | 699 | return self.iconReadError( |
| 700 | error.UnexpectedEOF, | 700 | error.UnexpectedEOF, |
| 701 | filename_utf8, | 701 | filename_utf8, |
lib/compiler/resinator/preprocess.zig+2-4
| ... | @@ -19,7 +19,7 @@ pub fn preprocess( | ... | @@ -19,7 +19,7 @@ pub fn preprocess( |
| 19 | var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" }; | 19 | var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" }; |
| 20 | defer driver.deinit(); | 20 | defer driver.deinit(); |
| 21 | 21 | ||
| 22 | var macro_buf: std.ArrayListUnmanaged(u8) = .empty; | 22 | var macro_buf: std.ArrayList(u8) = .empty; |
| 23 | defer macro_buf.deinit(comp.gpa); | 23 | defer macro_buf.deinit(comp.gpa); |
| 24 | 24 | ||
| 25 | var discard_buffer: [64]u8 = undefined; | 25 | var discard_buffer: [64]u8 = undefined; |
| ... | @@ -66,9 +66,7 @@ pub fn preprocess( | ... | @@ -66,9 +66,7 @@ pub fn preprocess( |
| 66 | 66 | ||
| 67 | if (hasAnyErrors(comp)) return error.PreprocessError; | 67 | if (hasAnyErrors(comp)) return error.PreprocessError; |
| 68 | 68 | ||
| 69 | pp.prettyPrintTokens(writer, .result_only) catch |err| switch (err) { | 69 | try pp.prettyPrintTokens(writer, .result_only); |
| 70 | error.WriteFailed => return error.OutOfMemory, | ||
| 71 | }; | ||
| 72 | 70 | ||
| 73 | if (maybe_dependencies) |dependencies| { | 71 | if (maybe_dependencies) |dependencies| { |
| 74 | for (comp.sources.values()) |comp_source| { | 72 | for (comp.sources.values()) |comp_source| { |