Commit e2468e3f2732a7a301f4174eb4d99bca5315a643 | zig

author	Joachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-25 21:35:28+01:00
committer	Joachim Schmidt <joachim.schmidt557@outlook.com> 2022-03-26 17:21:42+01:00
log	e2468e3f2732a7a301f4174eb4d99bca5315a643
tree	a4c1ae95a4f040b3e27d8903bf3af770cf567bd9
parent	1803167db2d5045e71015498b8e5b184c53edf07
signature	Commit is signed but in an unrecognized format.

Sema: change zirOverflowArithmetic to use new version of AIR insts

Also applies the change to Liveness

2 files changed, 32 insertions(+), 7 deletions(-)

src
- Liveness.zig
- Sema.zig

src/Liveness.zig+8-3

 @@ -508,14 +508,19 @@ fn analyzeInst(
         },
         .memset,
         .memcpy,
+        => {
+            const pl_op = inst_datas[inst].pl_op;
+            const extra = a.air.extraData(Air.Bin, pl_op.payload).data;
+            return trackOperands(a, new_set, inst, main_tomb, .{ pl_op.operand, extra.lhs, extra.rhs });
+        },
         .add_with_overflow,
         .sub_with_overflow,
         .mul_with_overflow,
         .shl_with_overflow,
         => {
-            const pl_op = inst_datas[inst].pl_op;
+            const ty_pl = inst_datas[inst].ty_pl;
-            const extra = a.air.extraData(Air.Bin, pl_op.payload).data;
+            const extra = a.air.extraData(Air.Bin, ty_pl.payload).data;
-            return trackOperands(a, new_set, inst, main_tomb, .{ pl_op.operand, extra.lhs, extra.rhs });
+            return trackOperands(a, new_set, inst, main_tomb, .{ extra.lhs, extra.rhs, .none });
         },
         .br => {
             const br = inst_datas[inst].br;

src/Sema.zig+24-4

...	@@ -9064,6 +9064,18 @@ fn zirOverflowArithmetic(	...	@@ -9064,6 +9064,18 @@ fn zirOverflowArithmetic(
9064	const maybe_lhs_val = try sema.resolveMaybeUndefVal(block, lhs_src, lhs);	9064	const maybe_lhs_val = try sema.resolveMaybeUndefVal(block, lhs_src, lhs);
9065	const maybe_rhs_val = try sema.resolveMaybeUndefVal(block, rhs_src, rhs);	9065	const maybe_rhs_val = try sema.resolveMaybeUndefVal(block, rhs_src, rhs);
9066		9066
		9067	const types = try sema.arena.alloc(Type, 2);
		9068	const values = try sema.arena.alloc(Value, 2);
		9069	const tuple_ty = try Type.Tag.tuple.create(sema.arena, .{
		9070	.types = types,
		9071	.values = values,
		9072	});
		9073
		9074	types[0] = dest_ty;
		9075	types[1] = Type.initTag(.u1);
		9076	values[0] = Value.initTag(.unreachable_value);
		9077	values[1] = Value.initTag(.unreachable_value);
		9078
9067	const result: struct {	9079	const result: struct {
9068	overflowed: enum { yes, no, undef },	9080	overflowed: enum { yes, no, undef },
9069	wrapped: Air.Inst.Ref,	9081	wrapped: Air.Inst.Ref,
...	@@ -9188,16 +9200,24 @@ fn zirOverflowArithmetic(	...	@@ -9188,16 +9200,24 @@ fn zirOverflowArithmetic(
9188	};	9200	};
9189		9201
9190	try sema.requireRuntimeBlock(block, src);	9202	try sema.requireRuntimeBlock(block, src);
9191	return block.addInst(.{	9203
		9204	const tuple = try block.addInst(.{
9192	.tag = air_tag,	9205	.tag = air_tag,
9193	.data = .{ .pl_op = .{	9206	.data = .{ .ty_pl = .{
9194	.operand = ptr,	9207	.ty = try block.sema.addType(tuple_ty),
9195	.payload = try sema.addExtra(Air.Bin{	9208	.payload = try block.sema.addExtra(Air.Bin{
9196	.lhs = lhs,	9209	.lhs = lhs,
9197	.rhs = rhs,	9210	.rhs = rhs,
9198	}),	9211	}),
9199	} },	9212	} },
9200	});	9213	});
		9214
		9215	const wrapped = try block.addStructFieldVal(tuple, 0, dest_ty);
		9216	try sema.storePtr2(block, src, ptr, ptr_src, wrapped, src, .store);
		9217
		9218	const overflow_bit = try block.addStructFieldVal(tuple, 1, Type.initTag(.u1));
		9219	const zero_u1 = try sema.addConstant(Type.initTag(.u1), Value.zero);
		9220	return try block.addBinOp(.cmp_neq, overflow_bit, zero_u1);
9201	};	9221	};
9202		9222
9203	try sema.storePtr2(block, src, ptr, ptr_src, result.wrapped, src, .store);	9223	try sema.storePtr2(block, src, ptr, ptr_src, result.wrapped, src, .store);