authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-10-20 05:47:54-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2022-10-25 05:11:29-04:00
log8b6a3ba74ea50602284543382ff1729a60b75122
treef2df9b5599c4a7d9ade4e581782248db33ddeb09
parent3d90ee50ff184dd7a94005f2769d055e460ad290

cbe: fix typedef declaration order

5 files changed, 153 insertions(+), 150 deletions(-)

src/codegen/c.zig+153-146
......@@ -48,6 +48,11 @@ const BlockData = struct {
4848 result: CValue,
4949};
5050
51const TypedefKind = enum {
52 Forward,
53 Complete,
54};
55
5156pub const CValueMap = std.AutoHashMap(Air.Inst.Ref, CValue);
5257pub const TypedefMap = std.ArrayHashMap(
5358 Type,
......@@ -249,13 +254,7 @@ pub const Function = struct {
249254 const decl_c_value = f.allocLocalValue();
250255 gop.value_ptr.* = decl_c_value;
251256 try writer.writeAll("static ");
252 try f.object.dg.renderTypeAndName(
253 writer,
254 ty,
255 decl_c_value,
256 .Const,
257 0,
258 );
257 try f.object.dg.renderTypeAndName(writer, ty, decl_c_value, .Const, 0, .Complete);
259258 try writer.writeAll(" = ");
260259 try f.object.dg.renderValue(writer, ty, val, .Initializer);
261260 try writer.writeAll(";\n ");
......@@ -294,6 +293,7 @@ pub const Function = struct {
294293 local_value,
295294 mutability,
296295 alignment,
296 .Complete,
297297 );
298298 return local_value;
299299 }
......@@ -328,7 +328,7 @@ pub const Function = struct {
328328 }
329329
330330 fn renderType(f: *Function, w: anytype, t: Type) !void {
331 return f.object.dg.renderType(w, t);
331 return f.object.dg.renderType(w, t, .Complete);
332332 }
333333
334334 fn renderTypecast(f: *Function, w: anytype, t: Type) !void {
......@@ -1024,10 +1024,7 @@ pub const DeclGen = struct {
10241024 }
10251025 }
10261026
1027 fn renderFunctionSignature(dg: *DeclGen, w: anytype, is_global: bool) !void {
1028 if (!is_global) {
1029 try w.writeAll("static ");
1030 }
1027 fn renderFunctionSignature(dg: *DeclGen, w: anytype, kind: TypedefKind) !void {
10311028 const fn_info = dg.decl.ty.fnInfo();
10321029 if (fn_info.cc == .Naked) {
10331030 try w.writeAll("ZIG_NAKED ");
......@@ -1039,9 +1036,9 @@ pub const DeclGen = struct {
10391036 }
10401037 }
10411038 if (fn_info.return_type.hasRuntimeBits()) {
1042 try dg.renderType(w, fn_info.return_type);
1039 try dg.renderType(w, fn_info.return_type, kind);
10431040 } else if (fn_info.return_type.isError()) {
1044 try dg.renderType(w, Type.anyerror);
1041 try dg.renderType(w, Type.anyerror, kind);
10451042 } else if (fn_info.return_type.zigTypeTag() == .NoReturn) {
10461043 try w.writeAll("zig_noreturn void");
10471044 } else {
......@@ -1058,7 +1055,7 @@ pub const DeclGen = struct {
10581055 try w.writeAll(", ");
10591056 }
10601057 const name = CValue{ .arg = index };
1061 try dg.renderTypeAndName(w, param_type, name, .Const, 0);
1058 try dg.renderTypeAndName(w, param_type, name, .Const, 0, kind);
10621059 index += 1;
10631060 }
10641061
......@@ -1071,15 +1068,15 @@ pub const DeclGen = struct {
10711068 try w.writeByte(')');
10721069 }
10731070
1074 fn renderPtrToFnTypedef(dg: *DeclGen, t: Type, fn_ty: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
1071 fn renderPtrToFnTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
10751072 var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
10761073 defer buffer.deinit();
10771074 const bw = buffer.writer();
10781075
1079 const fn_info = fn_ty.fnInfo();
1076 const fn_info = t.fnInfo();
10801077
10811078 try bw.writeAll("typedef ");
1082 try dg.renderType(bw, fn_info.return_type);
1079 try dg.renderType(bw, fn_info.return_type, .Forward);
10831080 try bw.writeAll(" (*");
10841081
10851082 const name_begin = buffer.items.len;
......@@ -1092,11 +1089,12 @@ pub const DeclGen = struct {
10921089 var params_written: usize = 0;
10931090 var index: usize = 0;
10941091 while (index < param_len) : (index += 1) {
1095 if (!fn_info.param_types[index].hasRuntimeBitsIgnoreComptime()) continue;
1092 const param_ty = fn_info.param_types[index];
1093 if (!param_ty.hasRuntimeBitsIgnoreComptime()) continue;
10961094 if (params_written > 0) {
10971095 try bw.writeAll(", ");
10981096 }
1099 try dg.renderTypecast(bw, fn_info.param_types[index]);
1097 try dg.renderTypeAndName(bw, param_ty, .{ .bytes = "" }, .Mut, 0, .Forward);
11001098 params_written += 1;
11011099 }
11021100
......@@ -1133,7 +1131,7 @@ pub const DeclGen = struct {
11331131 var ptr_type_buf: Type.SlicePtrFieldTypeBuffer = undefined;
11341132 const ptr_type = t.slicePtrFieldType(&ptr_type_buf);
11351133 const ptr_name = CValue{ .bytes = "ptr" };
1136 try dg.renderTypeAndName(bw, ptr_type, ptr_name, .Mut, 0);
1134 try dg.renderTypeAndName(bw, ptr_type, ptr_name, .Mut, 0, .Complete);
11371135
11381136 try bw.writeAll("; size_t len; } ");
11391137 const name_begin = buffer.items.len;
......@@ -1157,27 +1155,33 @@ pub const DeclGen = struct {
11571155 return name;
11581156 }
11591157
1160 fn renderStructTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
1161 const struct_obj = t.castTag(.@"struct").?.data; // Handle 0 bit types elsewhere.
1162 const fqn = try struct_obj.getFullyQualifiedName(dg.module);
1163 defer dg.typedefs.allocator.free(fqn);
1158 fn renderFwdTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
1159 // The forward declaration for T is stored with a key of *const T.
1160 const child_ty = t.childType();
1161
1162 var fqn_buf = std.ArrayList(u8).init(dg.typedefs.allocator);
1163 defer fqn_buf.deinit();
1164
1165 const owner_decl = dg.module.declPtr(child_ty.getOwnerDecl());
1166 try owner_decl.renderFullyQualifiedName(dg.module, fqn_buf.writer());
11641167
11651168 var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
11661169 defer buffer.deinit();
11671170
1168 const tag = "struct";
1169 const tagged_name_begin = buffer.items.len + "typedef ".len + tag.len + " ".len;
1170 try buffer.writer().print("typedef " ++ tag ++ " zig_S_{} ", .{fmtIdent(fqn)});
1171 const tagged_name_end = buffer.items.len - " ".len;
1172 try buffer.ensureUnusedCapacity(tagged_name_end - tagged_name_begin + ";\n".len);
1173 const name_begin = buffer.items.len;
1174 buffer.appendSliceAssumeCapacity(buffer.items[tagged_name_begin..tagged_name_end]);
1175 const name_end = buffer.items.len;
1171 const tag = switch (child_ty.zigTypeTag()) {
1172 .Struct => "struct ",
1173 .Union => if (child_ty.unionTagTypeSafety()) |_| "struct " else "union ",
1174 else => unreachable,
1175 };
1176 const name_begin = buffer.items.len + "typedef ".len + tag.len;
1177 try buffer.writer().print("typedef {s}zig_S_{} ", .{ tag, fmtIdent(fqn_buf.items) });
1178 const name_end = buffer.items.len - " ".len;
1179 try buffer.ensureUnusedCapacity((name_end - name_begin) + ";\n".len);
1180 buffer.appendSliceAssumeCapacity(buffer.items[name_begin..name_end]);
11761181 buffer.appendSliceAssumeCapacity(";\n");
11771182
11781183 const rendered = buffer.toOwnedSlice();
11791184 errdefer dg.typedefs.allocator.free(rendered);
1180 const tagged_name = rendered[tagged_name_begin..tagged_name_end];
11811185 const name = rendered[name_begin..name_end];
11821186
11831187 try dg.typedefs.ensureUnusedCapacity(1);
......@@ -1186,20 +1190,32 @@ pub const DeclGen = struct {
11861190 .{ .name = name, .rendered = rendered },
11871191 );
11881192
1189 try buffer.appendSlice(tag ++ " ");
1190 try buffer.appendSlice(tagged_name);
1193 return name;
1194 }
1195
1196 fn renderStructTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
1197 var ptr_pl = Type.Payload.ElemType{ .base = .{ .tag = .single_const_pointer }, .data = t };
1198 const ptr_ty = Type.initPayload(&ptr_pl.base);
1199 const name = dg.getTypedefName(ptr_ty) orelse
1200 try dg.renderFwdTypedef(ptr_ty);
1201
1202 var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
1203 defer buffer.deinit();
1204
1205 try buffer.appendSlice("struct ");
1206 try buffer.appendSlice(name);
11911207 try buffer.appendSlice(" {\n");
11921208 {
1193 var it = struct_obj.fields.iterator();
1209 var it = t.structFields().iterator();
11941210 var empty = true;
1195 while (it.next()) |entry| {
1196 const field_ty = entry.value_ptr.ty;
1211 while (it.next()) |field| {
1212 const field_ty = field.value_ptr.ty;
11971213 if (!field_ty.hasRuntimeBits()) continue;
11981214
1199 const alignment = entry.value_ptr.abi_align;
1200 const field_name: CValue = .{ .identifier = entry.key_ptr.* };
1215 const alignment = field.value_ptr.abi_align;
1216 const field_name = CValue{ .identifier = field.key_ptr.* };
12011217 try buffer.append(' ');
1202 try dg.renderTypeAndName(buffer.writer(), field_ty, field_name, .Mut, alignment);
1218 try dg.renderTypeAndName(buffer.writer(), field_ty, field_name, .Mut, alignment, .Complete);
12031219 try buffer.appendSlice(";\n");
12041220
12051221 empty = false;
......@@ -1208,16 +1224,13 @@ pub const DeclGen = struct {
12081224 }
12091225 try buffer.appendSlice("};\n");
12101226
1211 const rendered_body = buffer.toOwnedSlice();
1212 errdefer dg.typedefs.allocator.free(rendered_body);
1227 const rendered = buffer.toOwnedSlice();
1228 errdefer dg.typedefs.allocator.free(rendered);
12131229
1214 // We need to add another item to the TypedefMap, so we need a distinct
1215 // type that is not used anywhere, but is still uniquely associated with
1216 // this type, so use an empty struct which references our unique decls.
12171230 try dg.typedefs.ensureUnusedCapacity(1);
12181231 dg.typedefs.putAssumeCapacityNoClobber(
1219 try Type.Tag.empty_struct.create(dg.typedefs_arena, &struct_obj.namespace),
1220 .{ .name = undefined, .rendered = rendered_body },
1232 try t.copy(dg.typedefs_arena),
1233 .{ .name = name, .rendered = rendered },
12211234 );
12221235
12231236 return name;
......@@ -1240,7 +1253,7 @@ pub const DeclGen = struct {
12401253 defer dg.typedefs.allocator.free(field_name);
12411254
12421255 try buffer.append(' ');
1243 try dg.renderTypeAndName(buffer.writer(), field_ty, .{ .identifier = field_name }, .Mut, 0);
1256 try dg.renderTypeAndName(buffer.writer(), field_ty, .{ .identifier = field_name }, .Mut, 0, .Complete);
12441257 try buffer.appendSlice(";\n");
12451258
12461259 empty = false;
......@@ -1265,37 +1278,16 @@ pub const DeclGen = struct {
12651278 }
12661279
12671280 fn renderUnionTypedef(dg: *DeclGen, t: Type) error{ OutOfMemory, AnalysisFail }![]const u8 {
1268 const union_obj = t.cast(Type.Payload.Union).?.data;
1269 const fqn = try union_obj.getFullyQualifiedName(dg.module);
1270 defer dg.typedefs.allocator.free(fqn);
1281 var ptr_pl = Type.Payload.ElemType{ .base = .{ .tag = .single_const_pointer }, .data = t };
1282 const ptr_ty = Type.initPayload(&ptr_pl.base);
1283 const name = dg.getTypedefName(ptr_ty) orelse
1284 try dg.renderFwdTypedef(ptr_ty);
12711285
12721286 var buffer = std.ArrayList(u8).init(dg.typedefs.allocator);
12731287 defer buffer.deinit();
12741288
1275 const tag: []const u8 = if (t.unionTagTypeSafety()) |_| "struct" else "union";
1276 const tagged_name_begin = buffer.items.len + "typedef ".len + tag.len + " ".len;
1277 try buffer.writer().print("typedef {s} zig_S_{} ", .{ tag, fmtIdent(fqn) });
1278 const tagged_name_end = buffer.items.len - " ".len;
1279 try buffer.ensureUnusedCapacity(tagged_name_end - tagged_name_begin + ";\n".len);
1280 const name_begin = buffer.items.len;
1281 buffer.appendSliceAssumeCapacity(buffer.items[tagged_name_begin..tagged_name_end]);
1282 const name_end = buffer.items.len;
1283 buffer.appendSliceAssumeCapacity(";\n");
1284
1285 const rendered = buffer.toOwnedSlice();
1286 errdefer dg.typedefs.allocator.free(rendered);
1287 const tagged_name = rendered[tagged_name_begin..tagged_name_end];
1288 const name = rendered[name_begin..name_end];
1289
1290 try dg.typedefs.ensureUnusedCapacity(1);
1291 dg.typedefs.putAssumeCapacityNoClobber(
1292 try t.copy(dg.typedefs_arena),
1293 .{ .name = name, .rendered = rendered },
1294 );
1295
1296 try buffer.appendSlice(tag);
1297 try buffer.append(' ');
1298 try buffer.appendSlice(tagged_name);
1289 try buffer.appendSlice(if (t.unionTagTypeSafety()) |_| "struct " else "union ");
1290 try buffer.appendSlice(name);
12991291 try buffer.appendSlice(" {\n");
13001292
13011293 const indent = if (t.unionTagTypeSafety()) |tag_ty| indent: {
......@@ -1303,7 +1295,7 @@ pub const DeclGen = struct {
13031295 const layout = t.unionGetLayout(target);
13041296 if (layout.tag_size != 0) {
13051297 try buffer.append(' ');
1306 try dg.renderTypeAndName(buffer.writer(), tag_ty, .{ .identifier = "tag" }, .Mut, 0);
1298 try dg.renderTypeAndName(buffer.writer(), tag_ty, .{ .identifier = "tag" }, .Mut, 0, .Complete);
13071299 try buffer.appendSlice(";\n");
13081300 }
13091301 try buffer.appendSlice(" union {\n");
......@@ -1313,14 +1305,14 @@ pub const DeclGen = struct {
13131305 {
13141306 var it = t.unionFields().iterator();
13151307 var empty = true;
1316 while (it.next()) |entry| {
1317 const field_ty = entry.value_ptr.ty;
1308 while (it.next()) |field| {
1309 const field_ty = field.value_ptr.ty;
13181310 if (!field_ty.hasRuntimeBits()) continue;
13191311
1320 const alignment = entry.value_ptr.abi_align;
1321 const field_name: CValue = .{ .identifier = entry.key_ptr.* };
1312 const alignment = field.value_ptr.abi_align;
1313 const field_name = CValue{ .identifier = field.key_ptr.* };
13221314 try buffer.appendSlice(indent);
1323 try dg.renderTypeAndName(buffer.writer(), field_ty, field_name, .Mut, alignment);
1315 try dg.renderTypeAndName(buffer.writer(), field_ty, field_name, .Mut, alignment, .Complete);
13241316 try buffer.appendSlice(";\n");
13251317
13261318 empty = false;
......@@ -1334,16 +1326,13 @@ pub const DeclGen = struct {
13341326 if (t.unionTagTypeSafety()) |_| try buffer.appendSlice(" } payload;\n");
13351327 try buffer.appendSlice("};\n");
13361328
1337 const rendered_body = buffer.toOwnedSlice();
1338 errdefer dg.typedefs.allocator.free(rendered_body);
1329 const rendered = buffer.toOwnedSlice();
1330 errdefer dg.typedefs.allocator.free(rendered);
13391331
1340 // We need to add another item to the TypedefMap, so we need a distinct
1341 // type that is not used anywhere, but is still uniquely associated with
1342 // this type, so use an empty struct which references our unique decls.
13431332 try dg.typedefs.ensureUnusedCapacity(1);
13441333 dg.typedefs.putAssumeCapacityNoClobber(
1345 try Type.Tag.empty_struct.create(dg.typedefs_arena, &union_obj.namespace),
1346 .{ .name = undefined, .rendered = rendered_body },
1334 try t.copy(dg.typedefs_arena),
1335 .{ .name = name, .rendered = rendered },
13471336 );
13481337
13491338 return name;
......@@ -1363,11 +1352,11 @@ pub const DeclGen = struct {
13631352 const error_align = Type.anyerror.abiAlignment(target);
13641353 if (error_align > payload_align) {
13651354 try bw.writeAll("typedef struct { ");
1366 try dg.renderTypeAndName(bw, payload_ty, payload_name, .Mut, 0);
1355 try dg.renderTypeAndName(bw, payload_ty, payload_name, .Mut, 0, .Complete);
13671356 try bw.writeAll("; uint16_t error; } ");
13681357 } else {
13691358 try bw.writeAll("typedef struct { uint16_t error; ");
1370 try dg.renderTypeAndName(bw, payload_ty, payload_name, .Mut, 0);
1359 try dg.renderTypeAndName(bw, payload_ty, payload_name, .Mut, 0, .Complete);
13711360 try bw.writeAll("; } ");
13721361 }
13731362
......@@ -1398,7 +1387,7 @@ pub const DeclGen = struct {
13981387 const bw = buffer.writer();
13991388
14001389 try bw.writeAll("typedef ");
1401 try dg.renderType(bw, info.elem_type);
1390 try dg.renderType(bw, info.elem_type, .Complete);
14021391
14031392 const name_begin = buffer.items.len + " ".len;
14041393 try bw.print(" zig_A_{}_{d}", .{ typeToCIdentifier(info.elem_type, dg.module), info.len });
......@@ -1426,7 +1415,7 @@ pub const DeclGen = struct {
14261415
14271416 try bw.writeAll("typedef struct { ");
14281417 const payload_name = CValue{ .bytes = "payload" };
1429 try dg.renderTypeAndName(bw, child_type, payload_name, .Mut, 0);
1418 try dg.renderTypeAndName(bw, child_type, payload_name, .Mut, 0, .Complete);
14301419 try bw.writeAll("; bool is_null; } ");
14311420
14321421 const name_begin = buffer.items.len;
......@@ -1488,7 +1477,12 @@ pub const DeclGen = struct {
14881477 /// | `renderTypeAndName` | "uint8_t *name" | "uint8_t *name[10]" |
14891478 /// | `renderType` | "uint8_t *" | "zig_A_uint8_t_10" |
14901479 ///
1491 fn renderType(dg: *DeclGen, w: anytype, t: Type) error{ OutOfMemory, AnalysisFail }!void {
1480 fn renderType(
1481 dg: *DeclGen,
1482 w: anytype,
1483 t: Type,
1484 kind: TypedefKind,
1485 ) error{ OutOfMemory, AnalysisFail }!void {
14921486 const target = dg.module.getTarget();
14931487
14941488 switch (t.zigTypeTag()) {
......@@ -1540,10 +1534,11 @@ pub const DeclGen = struct {
15401534 }
15411535 },
15421536 .Pointer => {
1537 const child_ty = t.childType();
15431538 if (t.isSlice()) {
15441539 var slice_pl = Type.Payload.ElemType{
15451540 .base = .{ .tag = if (t.ptrIsMutable()) .mut_slice else .const_slice },
1546 .data = t.childType(),
1541 .data = child_ty,
15471542 };
15481543 const slice_ty = Type.initPayload(&slice_pl.base);
15491544
......@@ -1553,31 +1548,27 @@ pub const DeclGen = struct {
15531548 return w.writeAll(name);
15541549 }
15551550
1556 if (t.castPtrToFn()) |fn_ty| {
1557 const name = dg.getTypedefName(t) orelse
1558 try dg.renderPtrToFnTypedef(t, fn_ty);
1551 if (child_ty.zigTypeTag() == .Fn) {
1552 const name = dg.getTypedefName(child_ty) orelse
1553 try dg.renderPtrToFnTypedef(child_ty);
15591554
15601555 return w.writeAll(name);
15611556 }
15621557
1563 const child_ty = t.childType();
15641558 if (t.isCPtr() and child_ty.eql(Type.u8, dg.module) and
1565 (dg.decl.val.tag() == .extern_fn or std.mem.eql(u8, std.mem.span(dg.decl.name), "main")))
1559 (dg.decl.val.tag() == .extern_fn or
1560 std.mem.eql(u8, std.mem.span(dg.decl.name), "main")))
15661561 {
15671562 // This is a hack, since the c compiler expects a lot of external
15681563 // library functions to have char pointers in their signatures, but
15691564 // u8 and i8 produce unsigned char and signed char respectively,
1570 // which in C are not very usefully different than char.
1565 // which in C are (not very usefully) different than char.
15711566 try w.writeAll("char");
15721567 } else {
1573 try dg.renderType(w, child_ty);
1574 }
1575 if (t.isConstPtr()) {
1576 try w.writeAll(" const");
1577 }
1578 if (t.isVolatilePtr()) {
1579 try w.writeAll(" volatile");
1568 try dg.renderType(w, child_ty, .Forward);
15801569 }
1570 if (t.isConstPtr()) try w.writeAll(" const");
1571 if (t.isVolatilePtr()) try w.writeAll(" volatile");
15811572 return w.writeAll(" *");
15821573 },
15831574 .Array => {
......@@ -1601,7 +1592,7 @@ pub const DeclGen = struct {
16011592 }
16021593
16031594 if (t.optionalReprIsPayload()) {
1604 return dg.renderType(w, child_type);
1595 return dg.renderType(w, child_type, .Complete);
16051596 }
16061597
16071598 const name = dg.getTypedefName(t) orelse
......@@ -1617,7 +1608,7 @@ pub const DeclGen = struct {
16171608 const payload_ty = t.errorUnionPayload();
16181609
16191610 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) {
1620 return dg.renderType(w, Type.anyerror);
1611 return dg.renderType(w, Type.anyerror, .Complete);
16211612 }
16221613
16231614 var error_union_pl = Type.Payload.ErrorUnion{
......@@ -1630,17 +1621,26 @@ pub const DeclGen = struct {
16301621
16311622 return w.writeAll(name);
16321623 },
1633 .Struct => {
1634 const name = dg.getTypedefName(t) orelse if (t.isTupleOrAnonStruct())
1635 try dg.renderTupleTypedef(t)
1636 else
1637 try dg.renderStructTypedef(t);
1624 .Struct, .Union => |tag| if (kind == .Complete or t.isTupleOrAnonStruct()) {
1625 const name = dg.getTypedefName(t) orelse switch (tag) {
1626 .Struct => if (t.isTupleOrAnonStruct())
1627 try dg.renderTupleTypedef(t)
1628 else
1629 try dg.renderStructTypedef(t),
1630 .Union => try dg.renderUnionTypedef(t),
1631 else => unreachable,
1632 };
16381633
16391634 return w.writeAll(name);
1640 },
1641 .Union => {
1642 const name = dg.getTypedefName(t) orelse
1643 try dg.renderUnionTypedef(t);
1635 } else {
1636 var ptr_pl = Type.Payload.ElemType{
1637 .base = .{ .tag = .single_const_pointer },
1638 .data = t,
1639 };
1640 const ptr_ty = Type.initPayload(&ptr_pl.base);
1641
1642 const name = dg.getTypedefName(ptr_ty) orelse
1643 try dg.renderFwdTypedef(ptr_ty);
16441644
16451645 return w.writeAll(name);
16461646 },
......@@ -1649,7 +1649,7 @@ pub const DeclGen = struct {
16491649 var int_tag_buf: Type.Payload.Bits = undefined;
16501650 const int_tag_ty = t.intTagType(&int_tag_buf);
16511651
1652 try dg.renderType(w, int_tag_ty);
1652 try dg.renderType(w, int_tag_ty, kind);
16531653 },
16541654 .Opaque => switch (t.tag()) {
16551655 .anyopaque => try w.writeAll("void"),
......@@ -1701,7 +1701,7 @@ pub const DeclGen = struct {
17011701 ty: Type,
17021702 ) error{ OutOfMemory, AnalysisFail }!void {
17031703 const name = CValue{ .bytes = "" };
1704 return renderTypeAndName(dg, w, ty, name, .Mut, 0);
1704 return renderTypeAndName(dg, w, ty, name, .Mut, 0, .Complete);
17051705 }
17061706
17071707 /// Renders a type and name in field declaration/definition format.
......@@ -1720,6 +1720,7 @@ pub const DeclGen = struct {
17201720 name: CValue,
17211721 mutability: Mutability,
17221722 alignment: u32,
1723 kind: TypedefKind,
17231724 ) error{ OutOfMemory, AnalysisFail }!void {
17241725 var suffix = std.ArrayList(u8).init(dg.gpa);
17251726 defer suffix.deinit();
......@@ -1736,7 +1737,7 @@ pub const DeclGen = struct {
17361737
17371738 if (alignment != 0)
17381739 try w.print("ZIG_ALIGN({}) ", .{alignment});
1739 try dg.renderType(w, render_ty);
1740 try dg.renderType(w, render_ty, kind);
17401741
17411742 const const_prefix = switch (mutability) {
17421743 .Const => "const ",
......@@ -1755,11 +1756,11 @@ pub const DeclGen = struct {
17551756 const name_slice_ty = Type.initTag(.const_slice_u8_sentinel_0);
17561757
17571758 try buffer.appendSlice("static ");
1758 try dg.renderType(bw, name_slice_ty);
1759 try dg.renderType(bw, name_slice_ty, .Complete);
17591760 const name_begin = buffer.items.len + " ".len;
17601761 try bw.print(" zig_tagName_{}(", .{typeToCIdentifier(enum_ty, dg.module)});
17611762 const name_end = buffer.items.len - "(".len;
1762 try dg.renderTypeAndName(bw, enum_ty, .{ .identifier = "tag" }, .Const, 0);
1763 try dg.renderTypeAndName(bw, enum_ty, .{ .identifier = "tag" }, .Const, 0, .Complete);
17631764 try buffer.appendSlice(") {\n switch (tag) {\n");
17641765 for (enum_ty.enumFields().keys()) |name, index| {
17651766 const name_z = try dg.typedefs.allocator.dupeZ(u8, name);
......@@ -1785,7 +1786,7 @@ pub const DeclGen = struct {
17851786 const len_val = Value.initPayload(&len_pl.base);
17861787
17871788 try bw.print(" case {}: {{\n static ", .{try dg.fmtIntLiteral(enum_ty, int_val)});
1788 try dg.renderTypeAndName(bw, name_ty, .{ .identifier = "name" }, .Const, 0);
1789 try dg.renderTypeAndName(bw, name_ty, .{ .identifier = "name" }, .Const, 0, .Complete);
17891790 try buffer.appendSlice(" = ");
17901791 try dg.renderValue(bw, name_ty, name_val, .Initializer);
17911792 try buffer.appendSlice(";\n return (");
......@@ -1948,7 +1949,7 @@ pub fn genErrDecls(o: *Object) !void {
19481949 const name_val = Value.initPayload(&name_pl.base);
19491950
19501951 try writer.writeAll("static ");
1951 try o.dg.renderTypeAndName(writer, name_ty, .{ .identifier = identifier }, .Const, 0);
1952 try o.dg.renderTypeAndName(writer, name_ty, .{ .identifier = identifier }, .Const, 0, .Complete);
19521953 try writer.writeAll(" = ");
19531954 try o.dg.renderValue(writer, name_ty, name_val, .Initializer);
19541955 try writer.writeAll(";\n");
......@@ -1961,7 +1962,7 @@ pub fn genErrDecls(o: *Object) !void {
19611962 const name_array_ty = Type.initPayload(&name_array_ty_pl.base);
19621963
19631964 try writer.writeAll("static ");
1964 try o.dg.renderTypeAndName(writer, name_array_ty, .{ .identifier = name_prefix }, .Const, 0);
1965 try o.dg.renderTypeAndName(writer, name_array_ty, .{ .identifier = name_prefix }, .Const, 0, .Complete);
19651966 try writer.writeAll(" = {");
19661967 for (o.dg.module.error_name_list.items) |name, value| {
19671968 if (value != 0) try writer.writeByte(',');
......@@ -1988,14 +1989,13 @@ pub fn genFunc(f: *Function) !void {
19881989
19891990 const is_global = o.dg.module.decl_exports.contains(f.func.owner_decl);
19901991 const fwd_decl_writer = o.dg.fwd_decl.writer();
1991 if (is_global) {
1992 try fwd_decl_writer.writeAll("ZIG_EXTERN_C ");
1993 }
1994 try o.dg.renderFunctionSignature(fwd_decl_writer, is_global);
1992 try fwd_decl_writer.writeAll(if (is_global) "ZIG_EXTERN_C " else "static ");
1993 try o.dg.renderFunctionSignature(fwd_decl_writer, .Forward);
19951994 try fwd_decl_writer.writeAll(";\n");
19961995
19971996 try o.indent_writer.insertNewline();
1998 try o.dg.renderFunctionSignature(o.writer(), is_global);
1997 if (!is_global) try o.writer().writeAll("static ");
1998 try o.dg.renderFunctionSignature(o.writer(), .Complete);
19991999 try o.writer().writeByte(' ');
20002000
20012001 // In case we need to use the header, populate it with a copy of the function
......@@ -2029,7 +2029,7 @@ pub fn genDecl(o: *Object) !void {
20292029 if (tv.val.tag() == .extern_fn) {
20302030 const writer = o.writer();
20312031 try writer.writeAll("ZIG_EXTERN_C ");
2032 try o.dg.renderFunctionSignature(writer, true);
2032 try o.dg.renderFunctionSignature(writer, .Forward);
20332033 try writer.writeAll(";\n");
20342034 } else if (tv.val.castTag(.variable)) |var_payload| {
20352035 const variable: *Module.Var = var_payload.data;
......@@ -2048,7 +2048,7 @@ pub fn genDecl(o: *Object) !void {
20482048 .decl = o.dg.decl_index,
20492049 };
20502050
2051 try o.dg.renderTypeAndName(fwd_decl_writer, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align");
2051 try o.dg.renderTypeAndName(fwd_decl_writer, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
20522052 try fwd_decl_writer.writeAll(";\n");
20532053
20542054 if (variable.is_extern or variable.init.isUndefDeep()) {
......@@ -2057,7 +2057,7 @@ pub fn genDecl(o: *Object) !void {
20572057
20582058 try o.indent_writer.insertNewline();
20592059 const w = o.writer();
2060 try o.dg.renderTypeAndName(w, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align");
2060 try o.dg.renderTypeAndName(w, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
20612061 try w.writeAll(" = ");
20622062 if (variable.init.tag() != .unreachable_value) {
20632063 try o.dg.renderValue(w, tv.ty, variable.init, .Initializer);
......@@ -2072,7 +2072,7 @@ pub fn genDecl(o: *Object) !void {
20722072 // https://github.com/ziglang/zig/issues/7582
20732073
20742074 const decl_c_value: CValue = .{ .decl = o.dg.decl_index };
2075 try o.dg.renderTypeAndName(writer, tv.ty, decl_c_value, .Mut, o.dg.decl.@"align");
2075 try o.dg.renderTypeAndName(writer, tv.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
20762076
20772077 try writer.writeAll(" = ");
20782078 try o.dg.renderValue(writer, tv.ty, tv.val, .Initializer);
......@@ -2095,7 +2095,7 @@ pub fn genHeader(dg: *DeclGen) error{ AnalysisFail, OutOfMemory }!void {
20952095 const is_global = dg.declIsGlobal(tv);
20962096 if (is_global) {
20972097 try writer.writeAll("ZIG_EXTERN_C ");
2098 try dg.renderFunctionSignature(writer, is_global);
2098 try dg.renderFunctionSignature(writer, .Complete);
20992099 try dg.fwd_decl.appendSlice(";\n");
21002100 }
21012101 },
......@@ -2760,8 +2760,10 @@ fn airWrapOp(f: *Function, inst: Air.Inst.Index, operator: []const u8, fn_name:
27602760 const bits = int_info.bits;
27612761
27622762 // if it's an unsigned int with non-arbitrary bit size then we can just add
2763 if (int_info.signedness == .unsigned and bits == toCIntBits(bits)) {
2764 return try airBinOp(f, inst, operator);
2763 if (toCIntBits(bits)) |c_bits| {
2764 if (int_info.signedness == .unsigned and bits == c_bits) {
2765 return try airBinOp(f, inst, operator);
2766 }
27652767 }
27662768
27672769 if (bits > 64) return f.fail("TODO: C backend: airWrapOp for large integers", .{});
......@@ -3899,9 +3901,11 @@ fn structFieldPtr(f: *Function, inst: Air.Inst.Index, struct_ptr_ty: Type, struc
38993901 }
39003902 const payload = if (struct_ty.tag() == .union_tagged or struct_ty.tag() == .union_safety_tagged) "payload." else "";
39013903
3904 // Ensure complete type definition is visible before accessing fields.
3905 try f.renderType(std.io.null_writer, struct_ty);
3906
39023907 const inst_ty = f.air.typeOfIndex(inst);
39033908 const local = try f.allocLocal(inst_ty, .Const);
3904
39053909 if (field_val_ty.hasRuntimeBitsIgnoreComptime()) {
39063910 try writer.writeAll(" = &");
39073911 try f.writeCValueDeref(writer, struct_ptr);
......@@ -3941,6 +3945,9 @@ fn airStructFieldVal(f: *Function, inst: Air.Inst.Index) !CValue {
39413945 };
39423946 const payload = if (struct_ty.tag() == .union_tagged or struct_ty.tag() == .union_safety_tagged) "payload." else "";
39433947
3948 // Ensure complete type definition is visible before accessing fields.
3949 try f.renderType(std.io.null_writer, struct_ty);
3950
39443951 const inst_ty = f.air.typeOfIndex(inst);
39453952 const is_array = inst_ty.zigTypeTag() == .Array;
39463953 const local = try f.allocLocal(inst_ty, if (is_array) .Mut else .Const);
......@@ -4326,7 +4333,7 @@ fn airCmpxchg(f: *Function, inst: Air.Inst.Index, flavor: [*:0]const u8) !CValue
43264333 try writer.writeAll("if (");
43274334 }
43284335 try writer.print("zig_cmpxchg_{s}((zig_atomic(", .{flavor});
4329 try f.object.dg.renderTypecast(writer, ptr_ty.elemType());
4336 try f.renderTypecast(writer, ptr_ty.elemType());
43304337 try writer.writeByte(')');
43314338 if (ptr_ty.isVolatilePtr()) try writer.writeAll(" volatile");
43324339 try writer.writeAll(" *)");
......@@ -4371,12 +4378,12 @@ fn airAtomicRmw(f: *Function, inst: Air.Inst.Index) !CValue {
43714378 switch (extra.op()) {
43724379 else => {
43734380 try writer.writeAll("zig_atomic(");
4374 try f.object.dg.renderTypecast(writer, ptr_ty.elemType());
4381 try f.renderTypecast(writer, ptr_ty.elemType());
43754382 try writer.writeByte(')');
43764383 },
43774384 .Nand, .Min, .Max => {
43784385 // These are missing from stdatomic.h, so no atomic types for now.
4379 try f.object.dg.renderTypecast(writer, ptr_ty.elemType());
4386 try f.renderTypecast(writer, ptr_ty.elemType());
43804387 },
43814388 }
43824389 if (ptr_ty.isVolatilePtr()) try writer.writeAll(" volatile");
......@@ -4403,7 +4410,7 @@ fn airAtomicLoad(f: *Function, inst: Air.Inst.Index) !CValue {
44034410 const writer = f.object.writer();
44044411
44054412 try writer.writeAll(" = zig_atomic_load((zig_atomic(");
4406 try f.object.dg.renderTypecast(writer, ptr_ty.elemType());
4413 try f.renderTypecast(writer, ptr_ty.elemType());
44074414 try writer.writeByte(')');
44084415 if (ptr_ty.isVolatilePtr()) try writer.writeAll(" volatile");
44094416 try writer.writeAll(" *)");
......@@ -4423,7 +4430,7 @@ fn airAtomicStore(f: *Function, inst: Air.Inst.Index, order: [*:0]const u8) !CVa
44234430 const writer = f.object.writer();
44244431
44254432 try writer.writeAll("zig_atomic_store((zig_atomic(");
4426 try f.object.dg.renderTypecast(writer, ptr_ty.elemType());
4433 try f.renderTypecast(writer, ptr_ty.elemType());
44274434 try writer.writeByte(')');
44284435 if (ptr_ty.isVolatilePtr()) try writer.writeAll(" volatile");
44294436 try writer.writeAll(" *)");
test/behavior/bugs/1735.zig-1
......@@ -43,7 +43,6 @@ const a = struct {
4343
4444test "initialization" {
4545 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
46 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
4746 var t = a.init();
4847 try std.testing.expect(t.foo.len == 0);
4948}
test/behavior/bugs/1914.zig-1
......@@ -12,7 +12,6 @@ const b_list: []B = &[_]B{};
1212const a = A{ .b_list_pointer = &b_list };
1313
1414test "segfault bug" {
15 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1615 const assert = std.debug.assert;
1716 const obj = B{ .a_pointer = &a };
1817 assert(obj.a_pointer == &a); // this makes zig crash
test/behavior/error.zig-1
......@@ -470,7 +470,6 @@ test "function pointer with return type that is error union with payload which i
470470 return error.SkipZigTest;
471471 }
472472
473 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
474473 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
475474 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
476475
test/behavior/saturating_arithmetic.zig-1
......@@ -8,7 +8,6 @@ test "saturating add" {
88 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
99 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1010 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1211
1312 const S = struct {
1413 fn doTheTest() !void {