mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-09 15:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

cbe: canonicalize types that have the same C type when emitting typedefs

Browse Source
This commit is contained in:
Jacob Young 2022-10-10 02:04:37 -04:00
parent 5eafc10bf4
commit feb8f81cd9
4 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/codegen/c.zig
View File

@ -1067,6 +1067,8 @@ pub const DeclGen = struct {
} }
fn renderSliceTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 { fn renderSliceTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
std.debug.assert(t.sentinel() == null); // expected canonical type
var buffer = std.ArrayList(u8).init(dg.typedefs.allocator); var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
defer buffer.deinit(); defer buffer.deinit();
const bw = buffer.writer(); const bw = buffer.writer();
@ -1078,22 +1080,12 @@ pub const DeclGen = struct {
const ptr_name = CValue{ .bytes = "ptr" }; const ptr_name = CValue{ .bytes = "ptr" };
try dg.renderTypeAndName(bw, ptr_type, ptr_name, .Mut, 0); try dg.renderTypeAndName(bw, ptr_type, ptr_name, .Mut, 0);
const ptr_sentinel = ptr_type.ptrInfo().data.sentinel;
const child_type = t.childType();
try bw.writeAll("; size_t len; } "); try bw.writeAll("; size_t len; } ");
const name_begin = buffer.items.len; const name_begin = buffer.items.len;
try bw.print("zig_{c}_{}", .{ try bw.print("zig_{c}_{}", .{
@as(u8, if (t.isConstPtr()) 'L' else 'M'), @as(u8, if (t.isConstPtr()) 'L' else 'M'),
typeToCIdentifier(child_type, dg.module), typeToCIdentifier(t.childType(), dg.module),
}); });
if (ptr_sentinel) |s| {
var sentinel_buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
defer sentinel_buffer.deinit();
try dg.renderValue(sentinel_buffer.writer(), child_type, s, .Identifier);
try bw.print("_s_{}", .{fmtIdent(sentinel_buffer.items)});
}
const name_end = buffer.items.len; const name_end = buffer.items.len;
try bw.writeAll(";\n"); try bw.writeAll(";\n");
@ -1351,28 +1343,21 @@ pub const DeclGen = struct {
} }
fn renderArrayTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 { fn renderArrayTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
const info = t.arrayInfo();
std.debug.assert(info.sentinel == null); // expected canonical type
var buffer = std.ArrayList(u8).init(dg.typedefs.allocator); var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
defer buffer.deinit(); defer buffer.deinit();
const bw = buffer.writer(); const bw = buffer.writer();
const elem_type = t.elemType();
try bw.writeAll("typedef "); try bw.writeAll("typedef ");
try dg.renderType(bw, elem_type); try dg.renderType(bw, info.elem_type);
const name_begin = buffer.items.len + " ".len; const name_begin = buffer.items.len + " ".len;
try bw.print(" zig_A_{}_{d}", .{ typeToCIdentifier(elem_type, dg.module), t.arrayLen() }); try bw.print(" zig_A_{}_{d}", .{ typeToCIdentifier(info.elem_type, dg.module), info.len });
if (t.sentinel()) |s| {
var sentinel_buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
defer sentinel_buffer.deinit();
try dg.renderValue(sentinel_buffer.writer(), elem_type, s, .Identifier);
try bw.print("_s_{}", .{fmtIdent(sentinel_buffer.items)});
}
const name_end = buffer.items.len; const name_end = buffer.items.len;
const c_len = t.arrayLenIncludingSentinel(); try bw.print("[{d}];\n", .{if (info.len > 0) info.len else 1});
try bw.print("[{d}];\n", .{if (c_len > 0) c_len else 1});
const rendered = buffer.toOwnedSlice(); const rendered = buffer.toOwnedSlice();
errdefer dg.typedefs.allocator.free(rendered); errdefer dg.typedefs.allocator.free(rendered);
@ -1509,8 +1494,14 @@ pub const DeclGen = struct {
}, },
.Pointer => { .Pointer => {
if (t.isSlice()) { if (t.isSlice()) {
const name = dg.getTypedefName(t) orelse var slice_ty_pl = Type.Payload.ElemType{
try dg.renderSliceTypedef(t); .base = .{ .tag = if (t.ptrIsMutable()) .mut_slice else .const_slice },
.data = t.childType(),
};
const slice_ty = Type.initPayload(&slice_ty_pl.base);
const name = dg.getTypedefName(slice_ty) orelse
try dg.renderSliceTypedef(slice_ty);
return w.writeAll(name); return w.writeAll(name);
} }
@ -1541,8 +1532,14 @@ pub const DeclGen = struct {
return w.writeAll(" *"); return w.writeAll(" *");
}, },
.Array => { .Array => {
const name = dg.getTypedefName(t) orelse var array_ty_pl = Type.Payload.Array{ .base = .{ .tag = .array }, .data = .{
try dg.renderArrayTypedef(t); .len = t.arrayLenIncludingSentinel(),
.elem_type = t.childType(),
} };
const array_ty = Type.initPayload(&array_ty_pl.base);
const name = dg.getTypedefName(array_ty) orelse
try dg.renderArrayTypedef(array_ty);
return w.writeAll(name); return w.writeAll(name);
}, },

2
test/behavior/align.zig
View File

@ -221,7 +221,6 @@ fn fnWithAlignedStack() i32 {
} }
test "implicitly decreasing slice alignment" { test "implicitly decreasing slice alignment" {
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
const a: u32 align(4) = 3; const a: u32 align(4) = 3;
@ -244,7 +243,6 @@ fn testBytesAlign(b: u8) !void {
} }
test "@alignCast slices" { test "@alignCast slices" {
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;

1
test/behavior/for.zig
View File

@ -195,7 +195,6 @@ test "for on slice with allowzero ptr" {
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
const S = struct { const S = struct {
fn doTheTest(slice: []const u8) !void { fn doTheTest(slice: []const u8) !void {

2
test/behavior/slice.zig
View File

@ -319,7 +319,6 @@ test "empty array to slice" {
test "@ptrCast slice to pointer" { test "@ptrCast slice to pointer" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
const S = struct { const S = struct {
fn doTheTest() !void { fn doTheTest() !void {
@ -335,7 +334,6 @@ test "@ptrCast slice to pointer" {
} }
test "slice syntax resulting in pointer-to-array" { test "slice syntax resulting in pointer-to-array" {
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO