authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-07-13 20:12:23-04:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-07-19 23:38:40-04:00
logef84e869925d8a95e8e57895c421f398903b5f4f
tree9e9174e19931c6ba35d02eff65d73db92ac669dd
parent3f46e747a8adc61d0274c1cafa8abe8d02e6b10b

llvm: convert cursor positioning

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

src/codegen/llvm.zig+44-6
......@@ -862,6 +862,7 @@ pub const Object = struct {
862862
863863 const builder = wip.llvm.builder;
864864 const entry_block = try wip.block("Entry");
865 wip.cursor = .{ .block = entry_block };
865866 builder.positionBuilderAtEnd(entry_block.toLlvm(&wip));
866867 builder.clearCurrentDebugLocation();
867868
......@@ -1206,7 +1207,7 @@ pub const Object = struct {
12061207 if (isByRef(param_ty, mod)) {
12071208 const alignment = param_ty.abiAlignment(mod);
12081209 const param_llvm_ty = param.typeOf();
1209 const arg_ptr = try o.buildAllocaInner(builder, llvm_func, false, param_llvm_ty, alignment, target);
1210 const arg_ptr = try o.buildAllocaInner(&wip, builder, llvm_func, false, param_llvm_ty, alignment, target);
12101211 const store_inst = builder.buildStore(param, arg_ptr);
12111212 store_inst.setAlignment(alignment);
12121213 args.appendAssumeCapacity(arg_ptr);
......@@ -1267,7 +1268,7 @@ pub const Object = struct {
12671268 param_ty.abiAlignment(mod),
12681269 o.target_data.abiAlignmentOfType(int_llvm_ty),
12691270 );
1270 const arg_ptr = try o.buildAllocaInner(builder, llvm_func, false, param_llvm_ty, alignment, target);
1271 const arg_ptr = try o.buildAllocaInner(&wip, builder, llvm_func, false, param_llvm_ty, alignment, target);
12711272 const store_inst = builder.buildStore(param, arg_ptr);
12721273 store_inst.setAlignment(alignment);
12731274
......@@ -1316,7 +1317,7 @@ pub const Object = struct {
13161317 const param_ty = fn_info.param_types.get(ip)[it.zig_index - 1].toType();
13171318 const param_llvm_ty = (try o.lowerType(param_ty)).toLlvm(&o.builder);
13181319 const param_alignment = param_ty.abiAlignment(mod);
1319 const arg_ptr = try o.buildAllocaInner(builder, llvm_func, false, param_llvm_ty, param_alignment, target);
1320 const arg_ptr = try o.buildAllocaInner(&wip, builder, llvm_func, false, param_llvm_ty, param_alignment, target);
13201321 const llvm_ty = (try o.builder.structType(.normal, field_types)).toLlvm(&o.builder);
13211322 for (0..field_types.len) |field_i| {
13221323 const param = llvm_func.getParam(llvm_arg_i);
......@@ -1349,7 +1350,7 @@ pub const Object = struct {
13491350 llvm_arg_i += 1;
13501351
13511352 const alignment = param_ty.abiAlignment(mod);
1352 const arg_ptr = try o.buildAllocaInner(builder, llvm_func, false, param_llvm_ty, alignment, target);
1353 const arg_ptr = try o.buildAllocaInner(&wip, builder, llvm_func, false, param_llvm_ty, alignment, target);
13531354 _ = builder.buildStore(param, arg_ptr);
13541355
13551356 if (isByRef(param_ty, mod)) {
......@@ -1367,7 +1368,7 @@ pub const Object = struct {
13671368 llvm_arg_i += 1;
13681369
13691370 const alignment = param_ty.abiAlignment(mod);
1370 const arg_ptr = try o.buildAllocaInner(builder, llvm_func, false, param_llvm_ty, alignment, target);
1371 const arg_ptr = try o.buildAllocaInner(&wip, builder, llvm_func, false, param_llvm_ty, alignment, target);
13711372 _ = builder.buildStore(param, arg_ptr);
13721373
13731374 if (isByRef(param_ty, mod)) {
......@@ -4348,6 +4349,7 @@ pub const Object = struct {
43484349
43494350 fn buildAllocaInner(
43504351 o: *Object,
4352 wip: *Builder.WipFunction,
43514353 builder: *llvm.Builder,
43524354 llvm_func: *llvm.Value,
43534355 di_scope_non_null: bool,
......@@ -4358,9 +4360,11 @@ pub const Object = struct {
43584360 const address_space = llvmAllocaAddressSpace(target);
43594361
43604362 const alloca = blk: {
4363 const prev_cursor = wip.cursor;
43614364 const prev_block = builder.getInsertBlock();
43624365 const prev_debug_location = builder.getCurrentDebugLocation2();
43634366 defer {
4367 wip.cursor = prev_cursor;
43644368 builder.positionBuilderAtEnd(prev_block);
43654369 if (di_scope_non_null) {
43664370 builder.setCurrentDebugLocation2(prev_debug_location);
......@@ -4368,6 +4372,7 @@ pub const Object = struct {
43684372 }
43694373
43704374 const entry_block = llvm_func.getFirstBasicBlock().?;
4375 wip.cursor = .{ .block = .entry };
43714376 builder.positionBuilder(entry_block, entry_block.getFirstInstruction());
43724377 builder.clearCurrentDebugLocation();
43734378
......@@ -5485,12 +5490,15 @@ pub const FuncGen = struct {
54855490 llvm_switch.addCase(llvm_i2_00.toLlvm(&o.builder), both_null_block.toLlvm(&self.wip));
54865491 llvm_switch.addCase(llvm_i2_11.toLlvm(&o.builder), both_pl_block.toLlvm(&self.wip));
54875492
5493 self.wip.cursor = .{ .block = both_null_block };
54885494 self.builder.positionBuilderAtEnd(both_null_block.toLlvm(&self.wip));
54895495 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
54905496
5497 self.wip.cursor = .{ .block = mixed_block };
54915498 self.builder.positionBuilderAtEnd(mixed_block.toLlvm(&self.wip));
54925499 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
54935500
5501 self.wip.cursor = .{ .block = both_pl_block };
54945502 self.builder.positionBuilderAtEnd(both_pl_block.toLlvm(&self.wip));
54955503 const lhs_payload = try self.optPayloadHandle(opt_llvm_ty, lhs, scalar_ty, true);
54965504 const rhs_payload = try self.optPayloadHandle(opt_llvm_ty, rhs, scalar_ty, true);
......@@ -5498,6 +5506,7 @@ pub const FuncGen = struct {
54985506 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
54995507 const both_pl_block_end = self.builder.getInsertBlock();
55005508
5509 self.wip.cursor = .{ .block = end_block };
55015510 self.builder.positionBuilderAtEnd(end_block.toLlvm(&self.wip));
55025511 const incoming_blocks: [3]*llvm.BasicBlock = .{
55035512 both_null_block.toLlvm(&self.wip),
......@@ -5569,6 +5578,7 @@ pub const FuncGen = struct {
55695578
55705579 try self.genBody(body);
55715580
5581 self.wip.cursor = .{ .block = parent_bb };
55725582 self.builder.positionBuilderAtEnd(parent_bb.toLlvm(&self.wip));
55735583
55745584 // Create a phi node only if the block returns a value.
......@@ -5630,9 +5640,11 @@ pub const FuncGen = struct {
56305640 const else_block = try self.wip.block("Else");
56315641 _ = self.builder.buildCondBr(cond, then_block.toLlvm(&self.wip), else_block.toLlvm(&self.wip));
56325642
5643 self.wip.cursor = .{ .block = then_block };
56335644 self.builder.positionBuilderAtEnd(then_block.toLlvm(&self.wip));
56345645 try self.genBody(then_body);
56355646
5647 self.wip.cursor = .{ .block = else_block };
56365648 self.builder.positionBuilderAtEnd(else_block.toLlvm(&self.wip));
56375649 try self.genBody(else_body);
56385650
......@@ -5709,9 +5721,11 @@ pub const FuncGen = struct {
57095721 const continue_block = try fg.wip.block("TryCont");
57105722 _ = fg.builder.buildCondBr(is_err, return_block.toLlvm(&fg.wip), continue_block.toLlvm(&fg.wip));
57115723
5724 fg.wip.cursor = .{ .block = return_block };
57125725 fg.builder.positionBuilderAtEnd(return_block.toLlvm(&fg.wip));
57135726 try fg.genBody(body);
57145727
5728 fg.wip.cursor = .{ .block = continue_block };
57155729 fg.builder.positionBuilderAtEnd(continue_block.toLlvm(&fg.wip));
57165730 }
57175731 if (is_unused) {
......@@ -5771,10 +5785,12 @@ pub const FuncGen = struct {
57715785 llvm_switch.addCase(llvm_int_item, case_block.toLlvm(&self.wip));
57725786 }
57735787
5788 self.wip.cursor = .{ .block = case_block };
57745789 self.builder.positionBuilderAtEnd(case_block.toLlvm(&self.wip));
57755790 try self.genBody(case_body);
57765791 }
57775792
5793 self.wip.cursor = .{ .block = else_block };
57785794 self.builder.positionBuilderAtEnd(else_block.toLlvm(&self.wip));
57795795 const else_body = self.air.extra[extra_index..][0..switch_br.data.else_body_len];
57805796 if (else_body.len != 0) {
......@@ -5796,6 +5812,7 @@ pub const FuncGen = struct {
57965812 const loop_block = try self.wip.block("Loop");
57975813 _ = self.builder.buildBr(loop_block.toLlvm(&self.wip));
57985814
5815 self.wip.cursor = .{ .block = loop_block };
57995816 self.builder.positionBuilderAtEnd(loop_block.toLlvm(&self.wip));
58005817 try self.genBody(body);
58015818
......@@ -7361,9 +7378,11 @@ pub const FuncGen = struct {
73617378 const ok_block = try fg.wip.block("OverflowOk");
73627379 _ = fg.builder.buildCondBr(scalar_overflow_bit, fail_block.toLlvm(&fg.wip), ok_block.toLlvm(&fg.wip));
73637380
7381 fg.wip.cursor = .{ .block = fail_block };
73647382 fg.builder.positionBuilderAtEnd(fail_block.toLlvm(&fg.wip));
73657383 try fg.buildSimplePanic(.integer_overflow);
73667384
7385 fg.wip.cursor = .{ .block = ok_block };
73677386 fg.builder.positionBuilderAtEnd(ok_block.toLlvm(&fg.wip));
73687387 return fg.builder.buildExtractValue(result_struct, 0, "");
73697388 }
......@@ -8483,7 +8502,7 @@ pub const FuncGen = struct {
84838502 const o = self.dg.object;
84848503 const mod = o.module;
84858504 const target = mod.getTarget();
8486 return o.buildAllocaInner(self.builder, self.llvm_func, self.di_scope != null, llvm_ty, alignment, target);
8505 return o.buildAllocaInner(&self.wip, self.builder, self.llvm_func, self.di_scope != null, llvm_ty, alignment, target);
84878506 }
84888507
84898508 fn airStore(self: *FuncGen, inst: Air.Inst.Index, safety: bool) !?*llvm.Value {
......@@ -8894,11 +8913,13 @@ pub const FuncGen = struct {
88948913 const end_ptr = self.builder.buildInBoundsGEP(elem_llvm_ty, dest_ptr, &len_gep, len_gep.len, "");
88958914 _ = self.builder.buildBr(loop_block.toLlvm(&self.wip));
88968915
8916 self.wip.cursor = .{ .block = loop_block };
88978917 self.builder.positionBuilderAtEnd(loop_block.toLlvm(&self.wip));
88988918 const it_ptr = self.builder.buildPhi(Builder.Type.ptr.toLlvm(&o.builder), "");
88998919 const end = self.builder.buildICmp(.NE, it_ptr, end_ptr, "");
89008920 _ = self.builder.buildCondBr(end, body_block.toLlvm(&self.wip), end_block.toLlvm(&self.wip));
89018921
8922 self.wip.cursor = .{ .block = body_block };
89028923 self.builder.positionBuilderAtEnd(body_block.toLlvm(&self.wip));
89038924 const elem_abi_alignment = elem_ty.abiAlignment(mod);
89048925 const it_ptr_alignment = @min(elem_abi_alignment, dest_ptr_align);
......@@ -8922,6 +8943,7 @@ pub const FuncGen = struct {
89228943 const next_ptr = self.builder.buildInBoundsGEP(elem_llvm_ty, it_ptr, &one_gep, one_gep.len, "");
89238944 _ = self.builder.buildBr(loop_block.toLlvm(&self.wip));
89248945
8946 self.wip.cursor = .{ .block = end_block };
89258947 self.builder.positionBuilderAtEnd(end_block.toLlvm(&self.wip));
89268948
89278949 const incoming_values: [2]*llvm.Value = .{ next_ptr, dest_ptr };
......@@ -8945,9 +8967,11 @@ pub const FuncGen = struct {
89458967 const memset_block = try self.wip.block("MemsetTrapSkip");
89468968 const end_block = try self.wip.block("MemsetTrapEnd");
89478969 _ = self.builder.buildCondBr(cond, memset_block.toLlvm(&self.wip), end_block.toLlvm(&self.wip));
8970 self.wip.cursor = .{ .block = memset_block };
89488971 self.builder.positionBuilderAtEnd(memset_block.toLlvm(&self.wip));
89498972 _ = self.builder.buildMemSet(dest_ptr, fill_byte, len, dest_ptr_align, is_volatile);
89508973 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
8974 self.wip.cursor = .{ .block = end_block };
89518975 self.builder.positionBuilderAtEnd(end_block.toLlvm(&self.wip));
89528976 }
89538977
......@@ -8978,6 +9002,7 @@ pub const FuncGen = struct {
89789002 const memcpy_block = try self.wip.block("MemcpyTrapSkip");
89799003 const end_block = try self.wip.block("MemcpyTrapEnd");
89809004 _ = self.builder.buildCondBr(cond, memcpy_block.toLlvm(&self.wip), end_block.toLlvm(&self.wip));
9005 self.wip.cursor = .{ .block = memcpy_block };
89819006 self.builder.positionBuilderAtEnd(memcpy_block.toLlvm(&self.wip));
89829007 _ = self.builder.buildMemCpy(
89839008 dest_ptr,
......@@ -8988,6 +9013,7 @@ pub const FuncGen = struct {
89889013 is_volatile,
89899014 );
89909015 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
9016 self.wip.cursor = .{ .block = end_block };
89919017 self.builder.positionBuilderAtEnd(end_block.toLlvm(&self.wip));
89929018 return null;
89939019 }
......@@ -9182,12 +9208,15 @@ pub const FuncGen = struct {
91829208 try o.lowerValue((try mod.intValue(Type.err_int, err_int)).toIntern());
91839209 switch_instr.addCase(this_tag_int_value.toLlvm(&o.builder), valid_block.toLlvm(&self.wip));
91849210 }
9211 self.wip.cursor = .{ .block = valid_block };
91859212 self.builder.positionBuilderAtEnd(valid_block.toLlvm(&self.wip));
91869213 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
91879214
9215 self.wip.cursor = .{ .block = invalid_block };
91889216 self.builder.positionBuilderAtEnd(invalid_block.toLlvm(&self.wip));
91899217 _ = self.builder.buildBr(end_block.toLlvm(&self.wip));
91909218
9219 self.wip.cursor = .{ .block = end_block };
91919220 self.builder.positionBuilderAtEnd(end_block.toLlvm(&self.wip));
91929221
91939222 const incoming_values: [2]*llvm.Value = .{
......@@ -9261,6 +9290,7 @@ pub const FuncGen = struct {
92619290 defer wip.deinit();
92629291
92639292 const entry_block = try wip.block("Entry");
9293 wip.cursor = .{ .block = entry_block };
92649294 self.builder.positionBuilderAtEnd(entry_block.toLlvm(&wip));
92659295 self.builder.clearCurrentDebugLocation();
92669296
......@@ -9274,9 +9304,11 @@ pub const FuncGen = struct {
92749304 try o.lowerValue((try mod.enumValueFieldIndex(enum_ty, @intCast(field_index))).toIntern());
92759305 switch_instr.addCase(this_tag_int_value.toLlvm(&o.builder), named_block.toLlvm(&wip));
92769306 }
9307 wip.cursor = .{ .block = named_block };
92779308 self.builder.positionBuilderAtEnd(named_block.toLlvm(&wip));
92789309 _ = self.builder.buildRet(Builder.Constant.true.toLlvm(&o.builder));
92799310
9311 wip.cursor = .{ .block = unnamed_block };
92809312 self.builder.positionBuilderAtEnd(unnamed_block.toLlvm(&wip));
92819313 _ = self.builder.buildRet(Builder.Constant.false.toLlvm(&o.builder));
92829314
......@@ -9343,6 +9375,7 @@ pub const FuncGen = struct {
93439375 defer wip.deinit();
93449376
93459377 const entry_block = try wip.block("Entry");
9378 wip.cursor = .{ .block = entry_block };
93469379 self.builder.positionBuilderAtEnd(entry_block.toLlvm(&wip));
93479380 self.builder.clearCurrentDebugLocation();
93489381
......@@ -9387,10 +9420,12 @@ pub const FuncGen = struct {
93879420 try o.lowerValue((try mod.enumValueFieldIndex(enum_ty, @intCast(field_index))).toIntern());
93889421 switch_instr.addCase(this_tag_int_value.toLlvm(&o.builder), return_block.toLlvm(&wip));
93899422
9423 wip.cursor = .{ .block = return_block };
93909424 self.builder.positionBuilderAtEnd(return_block.toLlvm(&wip));
93919425 _ = self.builder.buildRet(slice_val.toLlvm(&o.builder));
93929426 }
93939427
9428 wip.cursor = .{ .block = bad_value_block };
93949429 self.builder.positionBuilderAtEnd(bad_value_block.toLlvm(&wip));
93959430 _ = self.builder.buildUnreachable();
93969431
......@@ -9535,6 +9570,7 @@ pub const FuncGen = struct {
95359570 const loop_exit = try self.wip.block("AfterReduce");
95369571 _ = self.builder.buildBr(loop.toLlvm(&self.wip));
95379572 {
9573 self.wip.cursor = .{ .block = loop };
95389574 self.builder.positionBuilderAtEnd(loop.toLlvm(&self.wip));
95399575
95409576 // while (i < vec.len)
......@@ -9545,6 +9581,7 @@ pub const FuncGen = struct {
95459581 _ = self.builder.buildCondBr(cond, loop_then.toLlvm(&self.wip), loop_exit.toLlvm(&self.wip));
95469582
95479583 {
9584 self.wip.cursor = .{ .block = loop_then };
95489585 self.builder.positionBuilderAtEnd(loop_then.toLlvm(&self.wip));
95499586
95509587 // accum = f(accum, vec[i]);
......@@ -9561,6 +9598,7 @@ pub const FuncGen = struct {
95619598 }
95629599 }
95639600
9601 self.wip.cursor = .{ .block = loop_exit };
95649602 self.builder.positionBuilderAtEnd(loop_exit.toLlvm(&self.wip));
95659603 return self.builder.buildLoad(llvm_result_ty, accum_ptr, "");
95669604 }
src/codegen/llvm/Builder.zig+2-1
......@@ -1072,6 +1072,7 @@ pub const WipFunction = struct {
10721072 instructions: std.ArrayListUnmanaged(Instruction.Index),
10731073
10741074 const Index = enum(u32) {
1075 entry,
10751076 _,
10761077
10771078 pub fn toLlvm(self: Index, wip: *const WipFunction) *llvm.BasicBlock {
......@@ -1223,7 +1224,7 @@ pub const WipFunction = struct {
12231224 if (self.builder.useLibLlvm()) {
12241225 try self.llvm.instructions.ensureUnusedCapacity(self.builder.gpa, 1);
12251226
1226 if (false) self.llvm.builder.positionBuilder(
1227 self.llvm.builder.positionBuilder(
12271228 self.cursor.block.toLlvm(self),
12281229 if (self.cursor.instruction < block_instructions.items.len)
12291230 self.llvm.instructions.items[