authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-16 10:38:44-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 14:17:06-07:00
log6064477928421c748c01db5e84401c4f9e220125
treee5cdbc2ee982a4079cfa81c297374eb51026afa5
parent4ed0cd51c0775edb35bb80786176300ecb357724

Merge pull request #13561 from jacobly0/gcc-warnings

2 files changed, 49 insertions(+), 33 deletions(-)

lib/zig.h+24-24
......@@ -929,8 +929,8 @@ typedef signed __int128 zig_i128;
929929#define zig_bitcast_u128(val) ((zig_u128)(val))
930930#define zig_bitcast_i128(val) ((zig_i128)(val))
931931#define zig_cmp_int128(Type) \
932 static inline zig_i8 zig_cmp_##Type(zig_##Type lhs, zig_##Type rhs) { \
933 return (zig_i8)((lhs > rhs) - (lhs < rhs)); \
932 static inline zig_i32 zig_cmp_##Type(zig_##Type lhs, zig_##Type rhs) { \
933 return (lhs > rhs) - (lhs < rhs); \
934934 }
935935#define zig_bit_int128(Type, operation, operator) \
936936 static inline zig_##Type zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
......@@ -956,7 +956,7 @@ typedef struct { zig_align(16) zig_i64 hi; zig_u64 lo; } zig_i128;
956956#define zig_bitcast_u128(val) zig_as_u128((zig_u64)(val).hi, (val).lo)
957957#define zig_bitcast_i128(val) zig_as_i128((zig_i64)(val).hi, (val).lo)
958958#define zig_cmp_int128(Type) \
959 static inline zig_i8 zig_cmp_##Type(zig_##Type lhs, zig_##Type rhs) { \
959 static inline zig_i32 zig_cmp_##Type(zig_##Type lhs, zig_##Type rhs) { \
960960 return (lhs.hi == rhs.hi) \
961961 ? (lhs.lo > rhs.lo) - (lhs.lo < rhs.lo) \
962962 : (lhs.hi > rhs.hi) - (lhs.hi < rhs.hi); \
......@@ -1123,23 +1123,23 @@ static inline zig_i128 zig_mod_i128(zig_i128 lhs, zig_i128 rhs) {
11231123#define zig_mod_u128 zig_rem_u128
11241124
11251125static inline zig_u128 zig_min_u128(zig_u128 lhs, zig_u128 rhs) {
1126 return zig_cmp_u128(lhs, rhs) < 0 ? lhs : rhs;
1126 return zig_cmp_u128(lhs, rhs) < zig_as_i32(0) ? lhs : rhs;
11271127}
11281128
11291129static inline zig_i128 zig_min_i128(zig_i128 lhs, zig_i128 rhs) {
1130 return zig_cmp_i128(lhs, rhs) < 0 ? lhs : rhs;
1130 return zig_cmp_i128(lhs, rhs) < zig_as_i32(0) ? lhs : rhs;
11311131}
11321132
11331133static inline zig_u128 zig_max_u128(zig_u128 lhs, zig_u128 rhs) {
1134 return zig_cmp_u128(lhs, rhs) > 0 ? lhs : rhs;
1134 return zig_cmp_u128(lhs, rhs) > zig_as_i32(0) ? lhs : rhs;
11351135}
11361136
11371137static inline zig_i128 zig_max_i128(zig_i128 lhs, zig_i128 rhs) {
1138 return zig_cmp_i128(lhs, rhs) > 0 ? lhs : rhs;
1138 return zig_cmp_i128(lhs, rhs) > zig_as_i32(0) ? lhs : rhs;
11391139}
11401140
11411141static inline zig_i128 zig_shr_i128(zig_i128 lhs, zig_u8 rhs) {
1142 zig_i128 sign_mask = zig_cmp_i128(lhs, zig_as_i128(0, 0)) < zig_as_i8(0) ? -zig_as_i128(0, 1) : zig_as_i128(0, 0);
1142 zig_i128 sign_mask = zig_cmp_i128(lhs, zig_as_i128(0, 0)) < zig_as_i32(0) ? -zig_as_i128(0, 1) : zig_as_i128(0, 0);
11431143 return zig_xor_i128(zig_bitcast_i128(zig_shr_u128(zig_bitcast_u128(zig_xor_i128(lhs, sign_mask)), rhs)), sign_mask);
11441144}
11451145
......@@ -1193,8 +1193,8 @@ static inline zig_bool zig_shlo_u128(zig_u128 *res, zig_u128 lhs, zig_u8 rhs, zi
11931193static inline zig_bool zig_shlo_i128(zig_i128 *res, zig_i128 lhs, zig_u8 rhs, zig_u8 bits) {
11941194 *res = zig_shlw_i128(lhs, rhs, bits);
11951195 zig_i128 mask = zig_bitcast_i128(zig_shl_u128(zig_maxInt_u128, bits - rhs - zig_as_u8(1)));
1196 return zig_cmp_i128(zig_and_i128(lhs, mask), zig_as_i128(0, 0)) != zig_as_i8(0) &&
1197 zig_cmp_i128(zig_and_i128(lhs, mask), mask) != zig_as_i8(0);
1196 return zig_cmp_i128(zig_and_i128(lhs, mask), zig_as_i128(0, 0)) != zig_as_i32(0) &&
1197 zig_cmp_i128(zig_and_i128(lhs, mask), mask) != zig_as_i32(0);
11981198}
11991199
12001200static inline zig_bool zig_addo_u128(zig_u128 *res, zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
......@@ -1291,15 +1291,15 @@ static inline zig_bool zig_subo_u128(zig_u128 *res, zig_u128 lhs, zig_u128 rhs)
12911291
12921292static inline zig_u128 zig_shls_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
12931293 zig_u128 res;
1294 if (zig_cmp_u128(rhs, zig_as_u128(0, bits)) >= zig_as_i8(0))
1295 return zig_cmp_u128(lhs, zig_as_u128(0, 0)) != zig_as_i8(0) ? zig_maxInt(u128, bits) : lhs;
1294 if (zig_cmp_u128(rhs, zig_as_u128(0, bits)) >= zig_as_i32(0))
1295 return zig_cmp_u128(lhs, zig_as_u128(0, 0)) != zig_as_i32(0) ? zig_maxInt(u128, bits) : lhs;
12961296 return zig_shlo_u128(&res, lhs, (zig_u8)rhs, bits) ? zig_maxInt(u128, bits) : res;
12971297}
12981298
12991299static inline zig_i128 zig_shls_i128(zig_i128 lhs, zig_i128 rhs, zig_u8 bits) {
13001300 zig_i128 res;
1301 if (zig_cmp_u128(zig_bitcast_u128(rhs), zig_as_u128(0, bits)) < zig_as_i8(0) && !zig_shlo_i128(&res, lhs, rhs, bits)) return res;
1302 return zig_cmp_i128(lhs, zig_as_i128(0, 0)) < zig_as_i8(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
1301 if (zig_cmp_u128(zig_bitcast_u128(rhs), zig_as_u128(0, bits)) < zig_as_i32(0) && !zig_shlo_i128(&res, lhs, rhs, bits)) return res;
1302 return zig_cmp_i128(lhs, zig_as_i128(0, 0)) < zig_as_i32(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
13031303}
13041304
13051305static inline zig_u128 zig_adds_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
......@@ -1310,7 +1310,7 @@ static inline zig_u128 zig_adds_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
13101310static inline zig_i128 zig_adds_i128(zig_i128 lhs, zig_i128 rhs, zig_u8 bits) {
13111311 zig_i128 res;
13121312 if (!zig_addo_i128(&res, lhs, rhs, bits)) return res;
1313 return zig_cmp_i128(res, zig_as_i128(0, 0)) >= zig_as_i8(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
1313 return zig_cmp_i128(res, zig_as_i128(0, 0)) >= zig_as_i32(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
13141314}
13151315
13161316static inline zig_u128 zig_subs_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
......@@ -1321,7 +1321,7 @@ static inline zig_u128 zig_subs_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
13211321static inline zig_i128 zig_subs_i128(zig_i128 lhs, zig_i128 rhs, zig_u8 bits) {
13221322 zig_i128 res;
13231323 if (!zig_subo_i128(&res, lhs, rhs, bits)) return res;
1324 return zig_cmp_i128(res, zig_as_i128(0, 0)) >= zig_as_i8(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
1324 return zig_cmp_i128(res, zig_as_i128(0, 0)) >= zig_as_i32(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
13251325}
13261326
13271327static inline zig_u128 zig_muls_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
......@@ -1332,7 +1332,7 @@ static inline zig_u128 zig_muls_u128(zig_u128 lhs, zig_u128 rhs, zig_u8 bits) {
13321332static inline zig_i128 zig_muls_i128(zig_i128 lhs, zig_i128 rhs, zig_u8 bits) {
13331333 zig_i128 res;
13341334 if (!zig_mulo_i128(&res, lhs, rhs, bits)) return res;
1335 return zig_cmp_i128(zig_xor_i128(lhs, rhs), zig_as_i128(0, 0)) < zig_as_i8(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
1335 return zig_cmp_i128(zig_xor_i128(lhs, rhs), zig_as_i128(0, 0)) < zig_as_i32(0) ? zig_minInt(i128, bits) : zig_maxInt(i128, bits);
13361336}
13371337
13381338static inline zig_u8 zig_clz_u128(zig_u128 val, zig_u8 bits) {
......@@ -1584,21 +1584,21 @@ zig_convert_builtin(f128, extend, f80, 2)
15841584 }
15851585
15861586#define zig_float_less_builtin_0(Type, operation) \
1587 zig_extern zig_i8 zig_expand_concat(zig_expand_concat(__##operation, \
1587 zig_extern zig_i32 zig_expand_concat(zig_expand_concat(__##operation, \
15881588 zig_compiler_rt_abbrev_##Type), 2)(zig_##Type, zig_##Type); \
1589 static inline zig_i8 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1590 return (zig_i8)zig_expand_concat(zig_expand_concat(__##operation, zig_compiler_rt_abbrev_##Type), 2)(lhs, rhs); \
1589 static inline zig_i32 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1590 return zig_expand_concat(zig_expand_concat(__##operation, zig_compiler_rt_abbrev_##Type), 2)(lhs, rhs); \
15911591 }
15921592#define zig_float_less_builtin_1(Type, operation) \
1593 static inline zig_i8 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1594 return (zig_i8)(!(lhs <= rhs) - (lhs < rhs)); \
1593 static inline zig_i32 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1594 return (!(lhs <= rhs) - (lhs < rhs)); \
15951595 }
15961596
15971597#define zig_float_greater_builtin_0(Type, operation) \
15981598 zig_float_less_builtin_0(Type, operation)
15991599#define zig_float_greater_builtin_1(Type, operation) \
1600 static inline zig_i8 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1601 return (zig_i8)((lhs > rhs) - !(lhs >= rhs)); \
1600 static inline zig_i32 zig_##operation##_##Type(zig_##Type lhs, zig_##Type rhs) { \
1601 return ((lhs > rhs) - !(lhs >= rhs)); \
16021602 }
16031603
16041604#define zig_float_binary_builtin_0(Type, operation, operator) \
src/codegen/c.zig+25-9
......@@ -176,7 +176,7 @@ const reserved_idents = std.ComptimeStringMap(void, .{
176176 .{ "register", {} },
177177 .{ "restrict", {} },
178178 .{ "return", {} },
179 .{ "short ", {} },
179 .{ "short", {} },
180180 .{ "signed", {} },
181181 .{ "size_t", {} },
182182 .{ "sizeof", {} },
......@@ -1140,10 +1140,16 @@ pub const DeclGen = struct {
11401140 const index = ty.unionTagFieldIndex(union_obj.tag, dg.module).?;
11411141 const field_ty = ty.unionFields().values()[index].ty;
11421142 const field_name = ty.unionFields().keys()[index];
1143 var it = ty.unionFields().iterator();
11431144 if (field_ty.hasRuntimeBits()) {
11441145 try writer.print(".{ } = ", .{fmtIdent(field_name)});
11451146 try dg.renderValue(writer, field_ty, union_obj.val, .Initializer);
1146 } else try writer.writeByte('0');
1147 } else while (it.next()) |field| {
1148 if (!field.value_ptr.ty.hasRuntimeBits()) continue;
1149 try writer.print(".{ } = ", .{fmtIdent(field.key_ptr.*)});
1150 try dg.renderValue(writer, field.value_ptr.ty, Value.undef, .Initializer);
1151 break;
1152 } else try writer.writeAll(".empty_union = 0");
11471153 if (ty.unionTagTypeSafety()) |_| try writer.writeByte('}');
11481154 try writer.writeByte('}');
11491155 },
......@@ -2658,12 +2664,14 @@ fn airPtrElemPtr(f: *Function, inst: Air.Inst.Index) !CValue {
26582664 const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;
26592665 const bin_op = f.air.extraData(Air.Bin, ty_pl.payload).data;
26602666 const ptr_ty = f.air.typeOf(bin_op.lhs);
2667 const child_ty = ptr_ty.childType();
26612668
26622669 const ptr = try f.resolveInst(bin_op.lhs);
2670 if (!child_ty.hasRuntimeBitsIgnoreComptime()) return ptr;
26632671 const index = try f.resolveInst(bin_op.rhs);
2672
26642673 const writer = f.object.writer();
26652674 const local = try f.allocLocal(f.air.typeOfIndex(inst), .Const);
2666
26672675 try writer.writeAll(" = &(");
26682676 if (ptr_ty.ptrSize() == .One) {
26692677 // It's a pointer to an array, so we need to de-reference.
......@@ -2717,15 +2725,23 @@ fn airSliceElemPtr(f: *Function, inst: Air.Inst.Index) !CValue {
27172725 const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;
27182726 const bin_op = f.air.extraData(Air.Bin, ty_pl.payload).data;
27192727
2728 const slice_ty = f.air.typeOf(bin_op.lhs);
2729 const child_ty = slice_ty.elemType2();
27202730 const slice = try f.resolveInst(bin_op.lhs);
2721 const index = try f.resolveInst(bin_op.rhs);
2731
27222732 const writer = f.object.writer();
27232733 const local = try f.allocLocal(f.air.typeOfIndex(inst), .Const);
2724 try writer.writeAll(" = &");
2734 try writer.writeAll(" = ");
2735 if (child_ty.hasRuntimeBitsIgnoreComptime()) try writer.writeByte('&');
27252736 try f.writeCValue(writer, slice, .Other);
2726 try writer.writeAll(".ptr[");
2727 try f.writeCValue(writer, index, .Other);
2728 try writer.writeAll("];\n");
2737 try writer.writeAll(".ptr");
2738 if (child_ty.hasRuntimeBitsIgnoreComptime()) {
2739 const index = try f.resolveInst(bin_op.rhs);
2740 try writer.writeByte('[');
2741 try f.writeCValue(writer, index, .Other);
2742 try writer.writeByte(']');
2743 }
2744 try writer.writeAll(";\n");
27292745 return local;
27302746}
27312747
......@@ -4825,7 +4841,7 @@ fn airCmpBuiltinCall(
48254841 try f.writeCValue(writer, try f.resolveInst(bin_op.lhs), .FunctionArgument);
48264842 try writer.writeAll(", ");
48274843 try f.writeCValue(writer, try f.resolveInst(bin_op.rhs), .FunctionArgument);
4828 try writer.print(") {s} {};\n", .{ operator, try f.fmtIntLiteral(Type.initTag(.i8), Value.zero) });
4844 try writer.print(") {s} {};\n", .{ operator, try f.fmtIntLiteral(Type.initTag(.i32), Value.zero) });
48294845 return local;
48304846}
48314847