mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resinator: Sync with upstream, fix an alignment problem

Browse source
This commit is contained in:
Ryan Liptak 2025-10-01 01:57:01 -07:00
parent fc59870e3b
commit c50aa2b95c
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/compiler/resinator/compile.zig
View file

@ -695,7 +695,7 @@ pub const Compiler = struct {
} }
try file_reader.seekTo(entry.data_offset_from_start_of_file); try file_reader.seekTo(entry.data_offset_from_start_of_file);
var header_bytes = (file_reader.interface.takeArray(16) catch { var header_bytes: [16]u8 align(@alignOf(ico.BitmapHeader)) = (file_reader.interface.takeArray(16) catch {
return self.iconReadError( return self.iconReadError(
error.UnexpectedEOF, error.UnexpectedEOF,
filename_utf8, filename_utf8,

6
lib/compiler/resinator/preprocess.zig
View file

@ -19,7 +19,7 @@ pub fn preprocess(
var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" }; var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" };
defer driver.deinit(); defer driver.deinit();
var macro_buf: std.ArrayListUnmanaged(u8) = .empty; var macro_buf: std.ArrayList(u8) = .empty;
defer macro_buf.deinit(comp.gpa); defer macro_buf.deinit(comp.gpa);
var discard_buffer: [64]u8 = undefined; var discard_buffer: [64]u8 = undefined;
@ -66,9 +66,7 @@ pub fn preprocess(
if (hasAnyErrors(comp)) return error.PreprocessError; if (hasAnyErrors(comp)) return error.PreprocessError;
pp.prettyPrintTokens(writer, .result_only) catch |err| switch (err) { try pp.prettyPrintTokens(writer, .result_only);
error.WriteFailed => return error.OutOfMemory,
};
if (maybe_dependencies) |dependencies| { if (maybe_dependencies) |dependencies| {
for (comp.sources.values()) |comp_source| { for (comp.sources.values()) |comp_source| {