Skip to content

Commit c50aa2b

Browse files
committed
resinator: Sync with upstream, fix an alignment problem
1 parent fc59870 commit c50aa2b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

lib/compiler/resinator/compile.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ pub const Compiler = struct {
695695
}
696696

697697
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 {
699699
return self.iconReadError(
700700
error.UnexpectedEOF,
701701
filename_utf8,

lib/compiler/resinator/preprocess.zig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn preprocess(
1919
var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" };
2020
defer driver.deinit();
2121

22-
var macro_buf: std.ArrayListUnmanaged(u8) = .empty;
22+
var macro_buf: std.ArrayList(u8) = .empty;
2323
defer macro_buf.deinit(comp.gpa);
2424

2525
var discard_buffer: [64]u8 = undefined;
@@ -66,9 +66,7 @@ pub fn preprocess(
6666

6767
if (hasAnyErrors(comp)) return error.PreprocessError;
6868

69-
pp.prettyPrintTokens(writer, .result_only) catch |err| switch (err) {
70-
error.WriteFailed => return error.OutOfMemory,
71-
};
69+
try pp.prettyPrintTokens(writer, .result_only);
7270

7371
if (maybe_dependencies) |dependencies| {
7472
for (comp.sources.values()) |comp_source| {

0 commit comments

Comments
 (0)