Update Aro and Zig #305

tondik commented 2026年03月13日 14:56:22 +01:00

Translate-C doesn't currently work on Zig master, fix for the issue (std.ArrayList now needs to be initialized as .empty not .{}) was merged in https://github.com/Vexu/arocc/pull/975.

Translate-C doesn't currently work on Zig master, fix for the issue (`std.ArrayList` now needs to be initialized as `.empty` not `.{}`) was merged in [https://github.com/Vexu/arocc/pull/975](https://github.com/Vexu/arocc/pull/975).

tondik commented 2026年03月16日 10:34:33 +01:00

The test failure is the result of changes made in zig#31403 where pointer types with explicit alignment are no longer considered equal to otherwise same pointers without explicit alignment (*u8 != *align(1) u8). The type of field alignment in std.builtin.Type.Pointer also changed from comptime_int to ?usize where null means implicit alignment, which is equivalent to @alignOf(child). The fix for this issue is either setting the @"align" in FlexibleArrayType to null:

 /// Constructs a [*c] pointer with the const and volatile annotations
 /// from SelfType for pointing to a C flexible array of ElementType.
 pub fn FlexibleArrayType(comptime SelfType: type, comptime ElementType: type) type {
 switch (@typeInfo(SelfType)) {
 .pointer => |ptr| {
 return @Pointer(.c, .{
 .@"const" = ptr.is_const,
 .@"volatile" = ptr.is_volatile,
 .@"allowzero" = true,
 .@"addrspace" = .generic,
- .@"align" = @alignOf(ElementType),
+ .@"align" = null,
 }, ElementType, null);
 },
 else => |info| @compileError("Invalid self type \"" ++ @tagName(info) ++ "\" for flexible array getter: " ++ @typeName(SelfType)),
 }
 }

or adding explicit alignment to the expected types in FlexibleArrayType test. Let me know which one is preferred.

The test failure is the result of changes made in [zig#31403](https://codeberg.org/ziglang/zig/pulls/31403#the-bad-stuff) where pointer types with explicit alignment are no longer considered equal to otherwise same pointers without explicit alignment (`*u8 != *align(1) u8`). The type of field `alignment` in `std.builtin.Type.Pointer` also changed from `comptime_int` to `?usize` where `null` means implicit alignment, which is equivalent to `@alignOf(child)`. The fix for this issue is either setting the `@"align"` in `FlexibleArrayType` to `null`: ```diff /// Constructs a [*c] pointer with the const and volatile annotations /// from SelfType for pointing to a C flexible array of ElementType. pub fn FlexibleArrayType(comptime SelfType: type, comptime ElementType: type) type { switch (@typeInfo(SelfType)) { .pointer => |ptr| { return @Pointer(.c, .{ .@"const" = ptr.is_const, .@"volatile" = ptr.is_volatile, .@"allowzero" = true, .@"addrspace" = .generic, - .@"align" = @alignOf(ElementType), + .@"align" = null, }, ElementType, null); }, else => |info| @compileError("Invalid self type \"" ++ @tagName(info) ++ "\" for flexible array getter: " ++ @typeName(SelfType)), } } ``` or adding explicit alignment to the expected types in `FlexibleArrayType` test. Let me know which one is preferred.

Vexu commented 2026年03月16日 11:32:55 +01:00

Explicit alignment is not needed.

Explicit alignment is not needed.