diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-04-09 00:50:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-09 00:50:58 -0700 |
| commit | ac21ade667f0f42b8b1aec5831cbc99cbaed8565 (patch) | |
| tree | f66d847662b81eefe8c30de88dfedb0d93cdc524 /src/codegen/c/Type.zig | |
| parent | d979df585d05de8d7385495fe6aee2b1d4e1380f (diff) | |
| parent | bc0e2089bc9408fa76716652a8ede5b5b44a817a (diff) | |
| download | zig-ac21ade667f0f42b8b1aec5831cbc99cbaed8565.tar.gz zig-ac21ade667f0f42b8b1aec5831cbc99cbaed8565.zip | |
Merge pull request #19572 from jacobly0/haiku-bootstrap
haiku: get cmake bootstrap working
Diffstat (limited to 'src/codegen/c/Type.zig')
| -rw-r--r-- | src/codegen/c/Type.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codegen/c/Type.zig b/src/codegen/c/Type.zig index 1c460acc6b..83d28dcb4f 100644 --- a/src/codegen/c/Type.zig +++ b/src/codegen/c/Type.zig @@ -1465,7 +1465,7 @@ pub const Pool = struct { }, }, .array_type => |array_info| { - const len = array_info.len + @intFromBool(array_info.sentinel != .none); + const len = array_info.lenIncludingSentinel(); if (len == 0) return .{ .index = .void }; const elem_type = Type.fromInterned(array_info.child); const elem_ctype = try pool.fromType( @@ -1479,7 +1479,7 @@ pub const Pool = struct { if (elem_ctype.index == .void) return .{ .index = .void }; const array_ctype = try pool.getArray(allocator, .{ .elem_ctype = elem_ctype, - .len = array_info.len + @intFromBool(array_info.sentinel != .none), + .len = len, }); if (!kind.isParameter()) return array_ctype; var fields = [_]Info.Field{ @@ -1625,7 +1625,7 @@ pub const Pool = struct { if (field_ctype.index == .void) continue; const field_name = if (loaded_struct.fieldName(ip, field_index) .unwrap()) |field_name| - try pool.string(allocator, ip.stringToSlice(field_name)) + try pool.string(allocator, field_name.toSlice(ip)) else try pool.fmt(allocator, "f{d}", .{field_index}); const field_alignas = AlignAs.fromAlignment(.{ @@ -1685,7 +1685,7 @@ pub const Pool = struct { if (field_ctype.index == .void) continue; const field_name = if (anon_struct_info.fieldName(ip, @intCast(field_index)) .unwrap()) |field_name| - try pool.string(allocator, ip.stringToSlice(field_name)) + try pool.string(allocator, field_name.toSlice(ip)) else try pool.fmt(allocator, "f{d}", .{field_index}); pool.addHashedExtraAssumeCapacityTo(scratch, &hasher, Field, .{ @@ -1766,7 +1766,7 @@ pub const Pool = struct { if (field_ctype.index == .void) continue; const field_name = try pool.string( allocator, - ip.stringToSlice(loaded_tag.names.get(ip)[field_index]), + loaded_tag.names.get(ip)[field_index].toSlice(ip), ); const field_alignas = AlignAs.fromAlignment(.{ .@"align" = loaded_union.fieldAlign(ip, @intCast(field_index)), |