1 files changed, 37 insertions, 22 deletions

diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index a14154d85f..d7aec355e9 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -1802,33 +1802,24 @@ pub const DeclGen = struct {
         const target = dg.module.getTarget();
 
         switch (t.zigTypeTag()) {
-            .NoReturn, .Void, .Bool, .Int, .Float, .ErrorSet => |tag| {
-                const is_named = switch (tag) {
-                    .Int => t.isNamedInt(),
-                    .ErrorSet => false,
-                    else => true,
-                };
-                if (is_named) {
+            .Void => {
+                try w.writeAll("void");
+            },
+            .NoReturn, .Bool, .Float => {
+                try w.writeAll("zig_");
+                try t.print(w, dg.module);
+            },
+            .Int => {
+                if (t.isNamedInt()) {
                     try w.writeAll("zig_");
                     try t.print(w, dg.module);
                 } else {
-                    const int_info = t.intInfo(target);
-                    if (toCIntBits(int_info.bits)) |c_bits|
-                        return w.print("zig_{c}{d}", .{ signAbbrev(int_info.signedness), c_bits })
-                    else if (loweredArrayInfo(t, target)) |array_info| {
-                        assert(array_info.sentinel == null);
-                        var array_pl = Type.Payload.Array{
-                            .base = .{ .tag = .array },
-                            .data = .{ .len = array_info.len, .elem_type = array_info.elem_type },
-                        };
-                        const array_ty = Type.initPayload(&array_pl.base);
-
-                        return dg.renderType(w, array_ty, kind);
-                    } else return dg.fail("C backend: Unable to lower unnamed integer type {}", .{
-                        t.fmt(dg.module),
-                    });
+                    return renderTypeUnnamed(dg, w, t, kind);
                 }
             },
+            .ErrorSet => {
+                return renderTypeUnnamed(dg, w, t, kind);
+            },
             .Pointer => {
                 const ptr_info = t.ptrInfo().data;
                 if (ptr_info.size == .Slice) {
@@ -2015,6 +2006,30 @@ pub const DeclGen = struct {
         }
     }
 
+    fn renderTypeUnnamed(
+        dg: *DeclGen,
+        w: anytype,
+        t: Type,
+        kind: TypedefKind,
+    ) error{ OutOfMemory, AnalysisFail }!void {
+        const target = dg.module.getTarget();
+        const int_info = t.intInfo(target);
+        if (toCIntBits(int_info.bits)) |c_bits|
+            return w.print("zig_{c}{d}", .{ signAbbrev(int_info.signedness), c_bits })
+        else if (loweredArrayInfo(t, target)) |array_info| {
+            assert(array_info.sentinel == null);
+            var array_pl = Type.Payload.Array{
+                .base = .{ .tag = .array },
+                .data = .{ .len = array_info.len, .elem_type = array_info.elem_type },
+            };
+            const array_ty = Type.initPayload(&array_pl.base);
+
+            return dg.renderType(w, array_ty, kind);
+        } else return dg.fail("C backend: Unable to lower unnamed integer type {}", .{
+            t.fmt(dg.module),
+        });
+    }
+
     /// Renders a type in C typecast format.
     ///
     /// This is guaranteed to be valid in a typecast expression, but not