authorgravatar for luuk@degram.devLuuk de Gram <luuk@degram.dev> 2021-07-19 21:50:15+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-07-20 12:19:17-07:00
logcaa0de545e2f45a96ac3136178f478dab1c89ebd
tree4e4c2bbbcf4b17e629110fe4c5eb80d0f32aa242
parent1150fc13dc779c91d54538304466cc068ccbf8ed

Resolve regressions

- Get correct types in wasm backend. - `arg` is already a `Ref`, therefore simply use `@intToEnum`. - Fix regression in `zirBoolBr, where the order of insertion was incorrect.

2 files changed, 10 insertions(+), 10 deletions(-)

src/Sema.zig+5-5
......@@ -5295,11 +5295,6 @@ fn zirBoolBr(
52955295 then_block.instructions.items.len + else_block.instructions.items.len +
52965296 @typeInfo(Air.Block).Struct.fields.len + child_block.instructions.items.len);
52975297
5298 sema.air_instructions.items(.data)[block_inst].ty_pl.payload = sema.addExtraAssumeCapacity(
5299 Air.Block{ .body_len = @intCast(u32, child_block.instructions.items.len) },
5300 );
5301 sema.air_extra.appendSliceAssumeCapacity(child_block.instructions.items);
5302
53035298 const cond_br_payload = sema.addExtraAssumeCapacity(Air.CondBr{
53045299 .then_body_len = @intCast(u32, then_block.instructions.items.len),
53055300 .else_body_len = @intCast(u32, else_block.instructions.items.len),
......@@ -5312,6 +5307,11 @@ fn zirBoolBr(
53125307 .payload = cond_br_payload,
53135308 } } });
53145309
5310 sema.air_instructions.items(.data)[block_inst].ty_pl.payload = sema.addExtraAssumeCapacity(
5311 Air.Block{ .body_len = @intCast(u32, child_block.instructions.items.len) },
5312 );
5313 sema.air_extra.appendSliceAssumeCapacity(child_block.instructions.items);
5314
53155315 try parent_block.instructions.append(gpa, block_inst);
53165316 return Air.indexToRef(block_inst);
53175317}
src/codegen/wasm.zig+5-5
......@@ -871,7 +871,7 @@ pub const Context = struct {
871871 };
872872
873873 for (args) |arg| {
874 const arg_val = self.resolveInst(Air.indexToRef(arg));
874 const arg_val = self.resolveInst(@intToEnum(Air.Inst.Ref, arg));
875875 try self.emitWValue(arg_val);
876876 }
877877
......@@ -959,7 +959,7 @@ pub const Context = struct {
959959 try self.emitWValue(lhs);
960960 try self.emitWValue(rhs);
961961
962 const bin_ty = self.air.getRefType(bin_op.lhs);
962 const bin_ty = self.air.typeOf(bin_op.lhs);
963963 const opcode: wasm.Opcode = buildOpcode(.{
964964 .op = op,
965965 .valtype1 = try self.typeToValtype(bin_ty),
......@@ -1179,7 +1179,7 @@ pub const Context = struct {
11791179 const data: Air.Inst.Data = self.air.instructions.items(.data)[inst];
11801180 const lhs = self.resolveInst(data.bin_op.lhs);
11811181 const rhs = self.resolveInst(data.bin_op.rhs);
1182 const lhs_ty = self.air.getRefType(data.bin_op.lhs);
1182 const lhs_ty = self.air.typeOf(data.bin_op.lhs);
11831183
11841184 try self.emitWValue(lhs);
11851185 try self.emitWValue(rhs);
......@@ -1211,7 +1211,7 @@ pub const Context = struct {
12111211 const br = self.air.instructions.items(.data)[inst].br;
12121212
12131213 // if operand has codegen bits we should break with a value
1214 if (self.air.getRefType(br.operand).hasCodeGenBits()) {
1214 if (self.air.typeOf(br.operand).hasCodeGenBits()) {
12151215 try self.emitWValue(self.resolveInst(br.operand));
12161216 }
12171217
......@@ -1277,7 +1277,7 @@ pub const Context = struct {
12771277 const else_body = self.air.extra[extra.end + cases.len ..][0..extra.data.else_body_len];
12781278
12791279 const target = self.resolveInst(pl_op.operand);
1280 const target_ty = self.air.getRefType(pl_op.operand);
1280 const target_ty = self.air.typeOf(pl_op.operand);
12811281 const valtype = try self.typeToValtype(target_ty);
12821282 // result type is always 'noreturn'
12831283 const blocktype = wasm.block_empty;