Commit 2d6d2a1d11bfca780e559303904571a93bace86b | zig

author	Jacob Young <jacobly@ziglang.org> 2023-06-15 01:30:06-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-06-15 14:06:49-07:00
log	2d6d2a1d11bfca780e559303904571a93bace86b
tree	fcc7005ea3911834e61407f65a41a483e556ec47
parent	1253d591be2aeea49c0b67ce0416237060e78a57

2 files changed, 9 insertions(+), 5 deletions(-)

src/TypedValue.zig+4-2

 @@ -345,12 +345,13 @@ pub fn print(
                         try writer.print("[{}]", .{elem.index});
                     },
                     .field => |field| {
-                        const container_ty = ip.typeOf(field.base).toType();
+                        const ptr_container_ty = ip.typeOf(field.base).toType();
                         try print(.{
-                            .ty = container_ty,
+                            .ty = ptr_container_ty,
                             .val = field.base.toValue(),
                         }, writer, level - 1, mod);
+                        const container_ty = ptr_container_ty.childType(mod);
                         switch (container_ty.zigTypeTag(mod)) {
                             .Struct => {
                                 if (container_ty.isTuple(mod)) {
 @@ -375,6 +376,7 @@ pub fn print(
                         }
                     },
                 }
+                return;
             },
             .opt => |opt| switch (opt.val) {
                 .none => return writer.writeAll("null"),

src/codegen/c.zig+5-3

 @@ -596,9 +596,11 @@ pub const DeclGen = struct {
                 },
                 location,
             ),
-            .int => |int| try writer.print("{x}", .{
+            .int => |int| {
-                try dg.fmtIntLiteral(Type.usize, int.toValue(), .Other),
+                try writer.writeByte('(');
-            }),
+                try dg.renderCType(writer, ptr_cty);
+                try writer.print("){x}", .{try dg.fmtIntLiteral(Type.usize, int.toValue(), .Other)});
+            },
             .eu_payload, .opt_payload => |base| {
                 const ptr_base_ty = mod.intern_pool.typeOf(base).toType();
                 const base_ty = ptr_base_ty.childType(mod);