Commit 962f33ee11

Jacob Young <jacobly0@users.noreply.github.com>
2022-10-08 17:29:06
cbe: implement airUnionInit
1 parent 6a4266d
Changed files (3)
src
codegen
test
src/codegen/c.zig
@@ -4331,16 +4331,43 @@ fn airAggregateInit(f: *Function, inst: Air.Inst.Index) !CValue {
 fn airUnionInit(f: *Function, inst: Air.Inst.Index) !CValue {
     if (f.liveness.isUnused(inst)) return CValue.none;
 
-    const inst_ty = f.air.typeOfIndex(inst);
     const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;
+    const extra = f.air.extraData(Air.UnionInit, ty_pl.payload).data;
+    const union_ty = f.air.typeOfIndex(inst);
+    const target = f.object.dg.module.getTarget();
+    const layout = union_ty.unionGetLayout(target);
+    const union_obj = union_ty.cast(Type.Payload.Union).?.data;
+    const field_name = union_obj.fields.keys()[extra.field_index];
+    const payload = try f.resolveInst(extra.init);
 
     const writer = f.object.writer();
-    const local = try f.allocLocal(inst_ty, .Const);
-    try writer.writeAll(" = ");
+    const local = try f.allocLocal(union_ty, .Const);
+    try writer.writeAll(" = {");
+    if (union_ty.unionTagTypeSafety()) |tag_ty| {
+        if (layout.tag_size != 0) {
+            const field_index = tag_ty.enumFieldIndex(field_name).?;
 
-    _ = local;
-    _ = ty_pl;
-    return f.fail("TODO: C backend: implement airUnionInit", .{});
+            var tag_val_pl: Value.Payload.U32 = .{
+                .base = .{ .tag = .enum_field_index },
+                .data = @intCast(u32, field_index),
+            };
+            const tag_val = Value.initPayload(&tag_val_pl.base);
+
+            var int_val_pl: Value.Payload.U64 = undefined;
+            const int_val = tag_val.enumToInt(tag_ty, &int_val_pl);
+
+            try writer.print(".tag = {}, ", .{try f.fmtIntLiteral(tag_ty, int_val)});
+        }
+        try writer.writeAll(".payload = {");
+    }
+
+    try writer.print(".{ } = ", .{fmtIdent(field_name)});
+    try f.writeCValue(writer, payload);
+
+    if (union_ty.unionTagTypeSafety()) |_| try writer.writeByte('}');
+    try writer.writeAll("};\n");
+
+    return local;
 }
 
 fn airPrefetch(f: *Function, inst: Air.Inst.Index) !CValue {
test/behavior/translate_c_macros.zig
@@ -58,7 +58,6 @@ test "cast negative integer to pointer" {
 test "casting to union with a macro" {
     if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
 
test/behavior/union.zig
@@ -776,7 +776,6 @@ test "return union init with void payload" {
 }
 
 test "@unionInit stored to a const" {
-    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_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
@@ -939,7 +938,6 @@ test "function call result coerces from tagged union to the tag" {
 }
 
 test "cast from anonymous struct to union" {
-    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_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
@@ -972,7 +970,6 @@ test "cast from anonymous struct to union" {
 }
 
 test "cast from pointer to anonymous struct to pointer to union" {
-    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_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
@@ -1135,7 +1132,6 @@ test "global variable struct contains union initialized to non-most-aligned fiel
 }
 
 test "union with no result loc initiated with a runtime value" {
-    if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
@@ -1152,7 +1148,6 @@ test "union with no result loc initiated with a runtime value" {
 }
 
 test "union with a large struct field" {
-    if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
@@ -1321,7 +1316,6 @@ test "union and enum field order doesn't match" {
 }
 
 test "@unionInit uses tag value instead of field index" {
-    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_aarch64) return error.SkipZigTest; // TODO
     if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO