authorgravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2022-12-13 01:19:21-05:00
committergravatar for kcbanner@gmail.comCasey Banner <kcbanner@gmail.com> 2023-01-01 16:44:28-05:00
log7fb3683c32fc24d12452f49e0c1639531e57c47d
tree0b9e38fd34be870ba2eb1e50147a58ec81709fd5
parent7f3bc45772d6af33e0e663ba534eba5653792843

cbe: more msvc compatibility work

- Add .StaticInitializer to ValueRenderLocation to indicate that the emitted values must be constant expressions (no function calls, struct casting). - Add new path for special float types (nan, inf) that works in constant expressions - Implement windows.teb() using a syscall for .stage2_c because x64 MSVC doesn't support any kind of inline asm

3 files changed, 146 insertions(+), 42 deletions(-)

lib/std/os/windows.zig+39-4
......@@ -1782,10 +1782,30 @@ pub fn teb() *TEB {
17821782 \\ movl %%fs:0x18, %[ptr]
17831783 : [ptr] "=r" (-> *TEB),
17841784 ),
1785 .x86_64 => asm volatile (
1786 \\ movq %%gs:0x30, %[ptr]
1787 : [ptr] "=r" (-> *TEB),
1788 ),
1785 .x86_64 => blk: {
1786 if (builtin.zig_backend == .stage2_c) {
1787 // TODO: __asm is not available on x64 MSVC. This is a workaround
1788 // until an intrinsic to read the gs register is available
1789 var thread_information: THREAD_BASIC_INFORMATION = undefined;
1790 const result = ntdll.NtQueryInformationThread(
1791 kernel32.GetCurrentThread(),
1792 .ThreadBasicInformation,
1793 &thread_information,
1794 @sizeOf(THREAD_BASIC_INFORMATION),
1795 null);
1796
1797 if (result == .SUCCESS) {
1798 break :blk @ptrCast(*TEB, @alignCast(@alignOf(TEB), thread_information.TebBaseAddress));
1799 } else {
1800 unexpectedStatus(result) catch unreachable;
1801 }
1802 } else {
1803 break :blk asm volatile (
1804 \\ movq %%gs:0x30, %[ptr]
1805 : [ptr] "=r" (-> *TEB),
1806 );
1807 }
1808 },
17891809 .aarch64 => asm volatile (
17901810 \\ mov %[ptr], x18
17911811 : [ptr] "=r" (-> *TEB),
......@@ -3455,6 +3475,21 @@ pub const ASSEMBLY_STORAGE_MAP = opaque {};
34553475pub const FLS_CALLBACK_INFO = opaque {};
34563476pub const RTL_BITMAP = opaque {};
34573477pub const KAFFINITY = usize;
3478pub const KPRIORITY = i32;
3479
3480pub const CLIENT_ID = extern struct {
3481 UniqueProcess: HANDLE,
3482 UniqueThread: HANDLE,
3483};
3484
3485pub const THREAD_BASIC_INFORMATION = extern struct {
3486 ExitStatus: NTSTATUS,
3487 TebBaseAddress: PVOID,
3488 ClientId: CLIENT_ID,
3489 AffinityMask: KAFFINITY,
3490 Priority: KPRIORITY,
3491 BasePriority: KPRIORITY,
3492};
34583493
34593494pub const TEB = extern struct {
34603495 Reserved1: [12]PVOID,
lib/zig.h+65-9
......@@ -1151,8 +1151,8 @@ typedef signed __int128 zig_i128;
11511151
11521152#define zig_as_u128(hi, lo) ((zig_u128)(hi)<<64|(lo))
11531153#define zig_as_i128(hi, lo) ((zig_i128)zig_as_u128(hi, lo))
1154#define zig_as_init_u128(hi, lo) zig_as_u128(hi, lo)
1155#define zig_as_init_i128(hi, lo) zig_as_i128(hi, lo)
1154#define zig_as_constant_u128(hi, lo) zig_as_u128(hi, lo)
1155#define zig_as_constant_i128(hi, lo) zig_as_i128(hi, lo)
11561156#define zig_hi_u128(val) ((zig_u64)((val) >> 64))
11571157#define zig_lo_u128(val) ((zig_u64)((val) >> 0))
11581158#define zig_hi_i128(val) ((zig_i64)((val) >> 64))
......@@ -1180,8 +1180,8 @@ typedef struct { zig_align(16) zig_i64 hi; zig_u64 lo; } zig_i128;
11801180
11811181#define zig_as_u128(hi, lo) ((zig_u128){ .h##i = (hi), .l##o = (lo) })
11821182#define zig_as_i128(hi, lo) ((zig_i128){ .h##i = (hi), .l##o = (lo) })
1183#define zig_as_init_u128(hi, lo) { .h##i = (hi), .l##o = (lo) }
1184#define zig_as_init_i128(hi, lo) { .h##i = (hi), .l##o = (lo) }
1183#define zig_as_constant_u128(hi, lo) { .h##i = (hi), .l##o = (lo) }
1184#define zig_as_constant_i128(hi, lo) { .h##i = (hi), .l##o = (lo) }
11851185#define zig_hi_u128(val) ((val).hi)
11861186#define zig_lo_u128(val) ((val).lo)
11871187#define zig_hi_i128(val) ((val).hi)
......@@ -1342,13 +1342,28 @@ static inline zig_i128 zig_sub_i128(zig_i128 lhs, zig_i128 rhs) {
13421342}
13431343
13441344// TODO: Implement
1345static zig_i128 zig_div_trunc_i128(zig_i128 lhs, zig_i128 rhs);
1345static zig_i128 zig_div_trunc_i128(zig_i128 lhs, zig_i128 rhs) {
1346
1347}
13461348
13471349// TODO: Implement
1348static zig_u128 zig_div_trunc_u128(zig_u128 lhs, zig_u128 rhs);
1350zig_extern zig_u128 __udivmodti4(zig_u128 lhs, zig_u128 rhs, zig_u128* rem);
1351static zig_u128 zig_div_trunc_u128(zig_u128 lhs, zig_u128 rhs) {
1352 zig_u128 rem;
1353 return __udivmodti4(lhs, rhs, &rem);
1354};
13491355
13501356// TODO: Implement
1351static zig_i128 zig_rem_i128(zig_i128 lhs, zig_i128 rhs);
1357zig_extern zig_i128 __modti3(zig_i128 lhs, zig_i128 rhs);
1358static zig_i128 zig_rem_i128(zig_i128 lhs, zig_i128 rhs) {
1359 return __modti3(lhs, rhs);
1360}
1361
1362// TODO: Implement
1363zig_extern zig_u128 __umodti3(zig_u128 lhs, zig_u128 rhs);
1364static zig_u128 zig_rem_u128(zig_u128 lhs, zig_u128 rhs) {
1365 return __umodti3(lhs, rhs);
1366}
13521367
13531368static inline zig_i128 zig_mod_i128(zig_i128 lhs, zig_i128 rhs) {
13541369 zig_i128 rem = zig_rem_i128(lhs, rhs);
......@@ -1413,8 +1428,16 @@ static inline zig_i128 zig_subw_i128(zig_i128 lhs, zig_i128 rhs, zig_u8 bits) {
14131428 return zig_wrap_i128(zig_bitcast_i128(zig_sub_u128(zig_bitcast_u128(lhs), zig_bitcast_u128(rhs))), bits);
14141429}
14151430
1416// TODO: Implement
1417static zig_u128 zig_mul_u128(zig_u128 lhs, zig_u128 rhs);
1431#if _MSC_VER
1432static zig_u128 zig_mul_u128(zig_u128 lhs, zig_u128 rhs) {
1433 zig_u64 lo_carry;
1434 zig_u64 lo = _umul128(lhs.lo, rhs.lo, &lo_carry);
1435 zig_u64 hi = lhs.hi * rhs.lo + lhs.lo * rhs.hi + lo_carry;
1436 return zig_as_u128(hi, lo);
1437}
1438#else
1439static zig_u128 zig_mul_u128(zig_u128 lhs, zig_u128 rhs); // TODO
1440#endif
14181441
14191442static inline zig_u128 zig_mulw_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
14201443 return zig_wrap_u128(zig_mul_u128(lhs, rhs), bits);
......@@ -1636,14 +1659,22 @@ static inline zig_i128 zig_bit_reverse_i128(zig_i128 val, zig_u8 bits) {
16361659/* ========================= Floating Point Support ========================= */
16371660
16381661#if _MSC_VER
1662#define zig_msvc_flt_inf ((double)(1e+300 * 1e+300))
1663#define zig_msvc_flt_inff ((float)(1e+300 * 1e+300))
1664#define zig_msvc_flt_infl ((long double)(1e+300 * 1e+300))
1665#define zig_msvc_flt_nan ((double)(zig_msvc_flt_inf * 0.f))
1666#define zig_msvc_flt_nanf ((float)(zig_msvc_flt_inf * 0.f))
1667#define zig_msvc_flt_nanl ((long double)(zig_msvc_flt_inf * 0.f))
16391668#define __builtin_nan(str) nan(str)
16401669#define __builtin_nanf(str) nanf(str)
16411670#define __builtin_nanl(str) nanl(str)
1671#define __builtin_inf() zig_msvc_flt_inf
16421672#endif
16431673
16441674#define zig_has_f16 1
16451675#define zig_bitSizeOf_f16 16
16461676#define zig_libc_name_f16(name) __##name##h
1677#define zig_as_special_constant_f16(sign, name, arg, repr) zig_as_special_f16(sign, name, arg, repr)
16471678#define zig_as_special_f16(sign, name, arg, repr) sign zig_as_f16(__builtin_##name, )(arg)
16481679#if FLT_MANT_DIG == 11
16491680typedef float zig_f16;
......@@ -1669,11 +1700,18 @@ typedef zig_i16 zig_f16;
16691700#define zig_as_f16(fp, repr) repr
16701701#undef zig_as_special_f16
16711702#define zig_as_special_f16(sign, name, arg, repr) repr
1703#undef zig_as_special_constant_f16
1704#define zig_as_special_constant_f16(sign, name, arg, repr) repr
16721705#endif
16731706
16741707#define zig_has_f32 1
16751708#define zig_bitSizeOf_f32 32
16761709#define zig_libc_name_f32(name) name##f
1710#if _MSC_VER
1711#define zig_as_special_constant_f32(sign, name, arg, repr) sign zig_as_f32(zig_msvc_flt_##name, )
1712#else
1713#define zig_as_special_constant_f32(sign, name, arg, repr) zig_as_special_f32(sign, name, arg, repr)
1714#endif
16771715#define zig_as_special_f32(sign, name, arg, repr) sign zig_as_f32(__builtin_##name, )(arg)
16781716#if FLT_MANT_DIG == 24
16791717typedef float zig_f32;
......@@ -1696,11 +1734,18 @@ typedef zig_i32 zig_f32;
16961734#define zig_as_f32(fp, repr) repr
16971735#undef zig_as_special_f32
16981736#define zig_as_special_f32(sign, name, arg, repr) repr
1737#undef zig_as_special_constant_f32
1738#define zig_as_special_constant_f32(sign, name, arg, repr) repr
16991739#endif
17001740
17011741#define zig_has_f64 1
17021742#define zig_bitSizeOf_f64 64
17031743#define zig_libc_name_f64(name) name
1744#if _MSC_VER
1745#define zig_as_special_constant_f64(sign, name, arg, repr) sign zig_as_f64(zig_msvc_flt_##name, )
1746#else
1747#define zig_as_special_constant_f64(sign, name, arg, repr) zig_as_special_f64(sign, name, arg, repr)
1748#endif
17041749#define zig_as_special_f64(sign, name, arg, repr) sign zig_as_f64(__builtin_##name, )(arg)
17051750#if FLT_MANT_DIG == 53
17061751typedef float zig_f64;
......@@ -1726,11 +1771,14 @@ typedef zig_i64 zig_f64;
17261771#define zig_as_f64(fp, repr) repr
17271772#undef zig_as_special_f64
17281773#define zig_as_special_f64(sign, name, arg, repr) repr
1774#undef zig_as_special_constant_f64
1775#define zig_as_special_constant_f64(sign, name, arg, repr) repr
17291776#endif
17301777
17311778#define zig_has_f80 1
17321779#define zig_bitSizeOf_f80 80
17331780#define zig_libc_name_f80(name) __##name##x
1781#define zig_as_special_constant_f80(sign, name, arg, repr) zig_as_special_f80(sign, name, arg, repr)
17341782#define zig_as_special_f80(sign, name, arg, repr) sign zig_as_f80(__builtin_##name, )(arg)
17351783#if FLT_MANT_DIG == 64
17361784typedef float zig_f80;
......@@ -1759,11 +1807,14 @@ typedef zig_i128 zig_f80;
17591807#define zig_as_f80(fp, repr) repr
17601808#undef zig_as_special_f80
17611809#define zig_as_special_f80(sign, name, arg, repr) repr
1810#undef zig_as_special_constant_f80
1811#define zig_as_special_constant_f80(sign, name, arg, repr) repr
17621812#endif
17631813
17641814#define zig_has_f128 1
17651815#define zig_bitSizeOf_f128 128
17661816#define zig_libc_name_f128(name) name##q
1817#define zig_as_special_constant_f128(sign, name, arg, repr) zig_as_special_f128(sign, name, arg, repr)
17671818#define zig_as_special_f128(sign, name, arg, repr) sign zig_as_f128(__builtin_##name, )(arg)
17681819#if FLT_MANT_DIG == 113
17691820typedef float zig_f128;
......@@ -1794,10 +1845,13 @@ typedef zig_i128 zig_f128;
17941845#define zig_as_f128(fp, repr) repr
17951846#undef zig_as_special_f128
17961847#define zig_as_special_f128(sign, name, arg, repr) repr
1848#undef zig_as_special_constant_f128
1849#define zig_as_special_constant_f128(sign, name, arg, repr) repr
17971850#endif
17981851
17991852#define zig_has_c_longdouble 1
18001853#define zig_libc_name_c_longdouble(name) name##l
1854#define zig_as_special_constant_c_longdouble(sign, name, arg, repr) zig_as_special_c_longdouble(sign, name, arg, repr)
18011855#define zig_as_special_c_longdouble(sign, name, arg, repr) sign __builtin_##name##l(arg)
18021856#if !_MSC_VER // TODO: Is there a better way to detect this is just double?
18031857typedef long double zig_c_longdouble;
......@@ -1811,6 +1865,8 @@ typedef zig_i128 zig_c_longdouble;
18111865#define zig_as_c_longdouble(fp, repr) repr
18121866#undef zig_as_special_c_longdouble
18131867#define zig_as_special_c_longdouble(sign, name, arg, repr) repr
1868#undef zig_as_special_constant_c_longdouble
1869#define zig_as_special_constant_c_longdouble(sign, name, arg, repr) repr
18141870#endif
18151871
18161872#define zig_cast_f16 (zig_f16)
src/codegen/c.zig+42-29
......@@ -711,6 +711,10 @@ pub const DeclGen = struct {
711711 val = rt.data;
712712 }
713713 const target = dg.module.getTarget();
714 const initializer_type: ValueRenderLocation = switch (location) {
715 .StaticInitializer => .StaticInitializer,
716 else => .Initializer,
717 };
714718
715719 const safety_on = switch (dg.module.optimizeMode()) {
716720 .Debug, .ReleaseSafe => true,
......@@ -785,9 +789,9 @@ pub const DeclGen = struct {
785789 }
786790
787791 try writer.writeAll("{ .payload = ");
788 try dg.renderValue(writer, payload_ty, val, .Initializer);
792 try dg.renderValue(writer, payload_ty, val, initializer_type);
789793 try writer.writeAll(", .is_null = ");
790 try dg.renderValue(writer, Type.bool, val, .Initializer);
794 try dg.renderValue(writer, Type.bool, val, initializer_type);
791795 return writer.writeAll(" }");
792796 },
793797 .Struct => switch (ty.containerLayout()) {
......@@ -804,7 +808,7 @@ pub const DeclGen = struct {
804808 if (!field.ty.hasRuntimeBits()) continue;
805809
806810 if (!empty) try writer.writeByte(',');
807 try dg.renderValue(writer, field.ty, val, .Initializer);
811 try dg.renderValue(writer, field.ty, val, initializer_type);
808812
809813 empty = false;
810814 }
......@@ -825,14 +829,14 @@ pub const DeclGen = struct {
825829 const layout = ty.unionGetLayout(target);
826830 if (layout.tag_size != 0) {
827831 try writer.writeAll(" .tag = ");
828 try dg.renderValue(writer, tag_ty, val, .Initializer);
832 try dg.renderValue(writer, tag_ty, val, initializer_type);
829833 try writer.writeByte(',');
830834 }
831835 try writer.writeAll(" .payload = {");
832836 }
833837 for (ty.unionFields().values()) |field| {
834838 if (!field.ty.hasRuntimeBits()) continue;
835 try dg.renderValue(writer, field.ty, val, .Initializer);
839 try dg.renderValue(writer, field.ty, val, initializer_type);
836840 break;
837841 } else try writer.print("{x}", .{try dg.fmtIntLiteral(Type.u8, Value.undef)});
838842 if (ty.unionTagTypeSafety()) |_| try writer.writeByte('}');
......@@ -846,7 +850,7 @@ pub const DeclGen = struct {
846850 }
847851
848852 try writer.writeAll("{ .payload = ");
849 try dg.renderValue(writer, ty.errorUnionPayload(), val, .Initializer);
853 try dg.renderValue(writer, ty.errorUnionPayload(), val, initializer_type);
850854 return writer.print(", .error = {x} }}", .{
851855 try dg.fmtIntLiteral(ty.errorUnionSet(), val),
852856 });
......@@ -873,7 +877,7 @@ pub const DeclGen = struct {
873877 var index: usize = 0;
874878 while (index < c_len) : (index += 1) {
875879 if (index > 0) try writer.writeAll(", ");
876 try dg.renderValue(writer, ty.childType(), val, .Initializer);
880 try dg.renderValue(writer, ty.childType(), val, initializer_type);
877881 }
878882 return writer.writeByte('}');
879883 }
......@@ -957,7 +961,7 @@ pub const DeclGen = struct {
957961 }
958962 try writer.writeAll(", ");
959963 empty = false;
960 } else if (location != .StaticInitializer) {
964 } else {
961965 // isSignalNan is equivalent to isNan currently, and MSVC doens't have nans, so prefer nan
962966 const operation = if (std.math.isNan(f128_val))
963967 "nan"
......@@ -968,7 +972,19 @@ pub const DeclGen = struct {
968972 else
969973 unreachable;
970974
975 if (location == .StaticInitializer) {
976 if (!std.math.isNan(f128_val) and std.math.isSignalNan(f128_val))
977 return dg.fail("TODO: C backend: implement nans rendering in static initializers", .{});
978
979 // MSVC doesn't have a way to define a custom or signaling NaN value in a constant expression
980
981 // TODO: Re-enable this check, otherwise we're writing qnan bit patterns on msvc incorrectly
982 // if (std.math.isNan(f128_val) and f128_val != std.math.qnan_f128)
983 // return dg.fail("Only quiet nans are supported in global variable initializers", .{});
984 }
985
971986 try writer.writeAll("zig_as_special_");
987 if (location == .StaticInitializer) try writer.writeAll("constant_");
972988 try dg.renderTypeForBuiltinFnName(writer, ty);
973989 try writer.writeByte('(');
974990 if (std.math.signbit(f128_val)) try writer.writeByte('-');
......@@ -987,7 +1003,6 @@ pub const DeclGen = struct {
9871003 };
9881004 try writer.writeAll(", ");
9891005 empty = false;
990
9911006 }
9921007 try writer.print("{x}", .{try dg.fmtIntLiteralLoc(int_ty, int_val, location)});
9931008 if (!empty) try writer.writeByte(')');
......@@ -1022,9 +1037,9 @@ pub const DeclGen = struct {
10221037 var buf: Type.SlicePtrFieldTypeBuffer = undefined;
10231038
10241039 try writer.writeByte('{');
1025 try dg.renderValue(writer, ty.slicePtrFieldType(&buf), slice.ptr, .Initializer);
1040 try dg.renderValue(writer, ty.slicePtrFieldType(&buf), slice.ptr, initializer_type);
10261041 try writer.writeAll(", ");
1027 try dg.renderValue(writer, Type.usize, slice.len, .Initializer);
1042 try dg.renderValue(writer, Type.usize, slice.len, initializer_type);
10281043 try writer.writeByte('}');
10291044 },
10301045 .function => {
......@@ -1062,7 +1077,7 @@ pub const DeclGen = struct {
10621077 try writer.writeByte('{');
10631078 const ai = ty.arrayInfo();
10641079 if (ai.sentinel) |s| {
1065 try dg.renderValue(writer, ai.elem_type, s, .Initializer);
1080 try dg.renderValue(writer, ai.elem_type, s, initializer_type);
10661081 } else {
10671082 try writer.writeByte('0');
10681083 }
......@@ -1085,6 +1100,7 @@ pub const DeclGen = struct {
10851100 // MSVC throws C2078 if an array of size 65536 or greater is initialized with a string literal
10861101 const max_string_initializer_len = 65535;
10871102
1103
10881104 const ai = ty.arrayInfo();
10891105 if (ai.elem_type.eql(Type.u8, dg.module)) {
10901106 if (ai.len <= max_string_initializer_len) {
......@@ -1112,7 +1128,7 @@ pub const DeclGen = struct {
11121128 }
11131129 if (ai.sentinel) |s| {
11141130 if (index != 0) try writer.writeByte(',');
1115 try dg.renderValue(writer, ai.elem_type, s, .Initializer);
1131 try dg.renderValue(writer, ai.elem_type, s, initializer_type);
11161132 }
11171133 try writer.writeByte('}');
11181134 }
......@@ -1122,11 +1138,11 @@ pub const DeclGen = struct {
11221138 while (index < ai.len) : (index += 1) {
11231139 if (index != 0) try writer.writeByte(',');
11241140 const elem_val = try val.elemValue(dg.module, arena_allocator, index);
1125 try dg.renderValue(writer, ai.elem_type, elem_val, .Initializer);
1141 try dg.renderValue(writer, ai.elem_type, elem_val, initializer_type);
11261142 }
11271143 if (ai.sentinel) |s| {
11281144 if (index != 0) try writer.writeByte(',');
1129 try dg.renderValue(writer, ai.elem_type, s, .Initializer);
1145 try dg.renderValue(writer, ai.elem_type, s, initializer_type);
11301146 }
11311147 try writer.writeByte('}');
11321148 }
......@@ -1162,9 +1178,9 @@ pub const DeclGen = struct {
11621178 const payload_val = if (val.castTag(.opt_payload)) |pl| pl.data else Value.undef;
11631179
11641180 try writer.writeAll("{ .payload = ");
1165 try dg.renderValue(writer, payload_ty, payload_val, .Initializer);
1181 try dg.renderValue(writer, payload_ty, payload_val, initializer_type);
11661182 try writer.writeAll(", .is_null = ");
1167 try dg.renderValue(writer, Type.bool, is_null_val, .Initializer);
1183 try dg.renderValue(writer, Type.bool, is_null_val, initializer_type);
11681184 try writer.writeAll(" }");
11691185 },
11701186 .ErrorSet => {
......@@ -1197,9 +1213,9 @@ pub const DeclGen = struct {
11971213 const error_val = if (val.errorUnionIsPayload()) Value.zero else val;
11981214
11991215 try writer.writeAll("{ .payload = ");
1200 try dg.renderValue(writer, payload_ty, payload_val, .Initializer);
1216 try dg.renderValue(writer, payload_ty, payload_val, initializer_type);
12011217 try writer.writeAll(", .error = ");
1202 try dg.renderValue(writer, error_ty, error_val, .Initializer);
1218 try dg.renderValue(writer, error_ty, error_val, initializer_type);
12031219 try writer.writeAll(" }");
12041220 },
12051221 .Enum => {
......@@ -1264,10 +1280,7 @@ pub const DeclGen = struct {
12641280 if (!field_ty.hasRuntimeBits()) continue;
12651281
12661282 if (!empty) try writer.writeByte(',');
1267 try dg.renderValue(writer, field_ty, field_val, switch (location) {
1268 .StaticInitializer => .StaticInitializer,
1269 else => .Initializer,
1270 });
1283 try dg.renderValue(writer, field_ty, field_val, initializer_type);
12711284
12721285 empty = false;
12731286 }
......@@ -1297,7 +1310,7 @@ pub const DeclGen = struct {
12971310
12981311 if (eff_num_fields == 0) {
12991312 try writer.writeByte('(');
1300 try dg.renderValue(writer, ty, Value.undef, .Initializer);
1313 try dg.renderValue(writer, ty, Value.undef, initializer_type);
13011314 try writer.writeByte(')');
13021315 } else if (ty.bitSize(target) > 64) {
13031316 // zig_or_u128(zig_or_u128(zig_shl_u128(a, a_off), zig_shl_u128(b, b_off)), zig_shl_u128(c, c_off))
......@@ -1385,7 +1398,7 @@ pub const DeclGen = struct {
13851398 try dg.renderTypecast(writer, ty);
13861399 try writer.writeByte(')');
13871400 }
1388 try dg.renderValue(writer, field_ty, union_obj.val, .Initializer);
1401 try dg.renderValue(writer, field_ty, union_obj.val, initializer_type);
13891402 } else {
13901403 try writer.writeAll("0");
13911404 }
......@@ -1397,7 +1410,7 @@ pub const DeclGen = struct {
13971410 const layout = ty.unionGetLayout(target);
13981411 if (layout.tag_size != 0) {
13991412 try writer.writeAll(".tag = ");
1400 try dg.renderValue(writer, tag_ty, union_obj.tag, .Initializer);
1413 try dg.renderValue(writer, tag_ty, union_obj.tag, initializer_type);
14011414 try writer.writeAll(", ");
14021415 }
14031416 try writer.writeAll(".payload = {");
......@@ -1406,11 +1419,11 @@ pub const DeclGen = struct {
14061419 var it = ty.unionFields().iterator();
14071420 if (field_ty.hasRuntimeBits()) {
14081421 try writer.print(".{ } = ", .{fmtIdent(field_name)});
1409 try dg.renderValue(writer, field_ty, union_obj.val, .Initializer);
1422 try dg.renderValue(writer, field_ty, union_obj.val, initializer_type);
14101423 } else while (it.next()) |field| {
14111424 if (!field.value_ptr.ty.hasRuntimeBits()) continue;
14121425 try writer.print(".{ } = ", .{fmtIdent(field.key_ptr.*)});
1413 try dg.renderValue(writer, field.value_ptr.ty, Value.undef, .Initializer);
1426 try dg.renderValue(writer, field.value_ptr.ty, Value.undef, initializer_type);
14141427 break;
14151428 } else try writer.writeAll(".empty_union = 0");
14161429 if (ty.unionTagTypeSafety()) |_| try writer.writeByte('}');
......@@ -7239,7 +7252,7 @@ fn formatIntLiteral(
72397252 else => {
72407253 if (int_info.bits > 64 and data.location != null and data.location.? == .StaticInitializer) {
72417254 // MSVC treats casting the struct initializer as not constant (C2099), so an alternate form is used in global initializers
7242 try writer.print("zig_as_init_{c}{d}(", .{ signAbbrev(int_info.signedness), c_bits });
7255 try writer.print("zig_as_constant_{c}{d}(", .{ signAbbrev(int_info.signedness), c_bits });
72437256 } else {
72447257 try writer.print("zig_as_{c}{d}(", .{ signAbbrev(int_info.signedness), c_bits });
72457258 }