Skip to content

Commit 5696bbb

Browse files
authored
Merge pull request #23552 from alichraghi
Progress towards support for running LLVM backend in a separate thread
2 parents e7b18a7 + a558885 commit 5696bbb

File tree

3 files changed

+610
-622
lines changed

3 files changed

+610
-622
lines changed

src/Compilation.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3042,7 +3042,7 @@ fn flush(
30423042
// If there's an output file, it wants to decide where the LLVM object goes!
30433043
const sub_prog_node = comp.link_prog_node.start("LLVM Emit Object", 0);
30443044
defer sub_prog_node.end();
3045-
try llvm_object.emit(.{
3045+
try llvm_object.emit(.{ .zcu = zcu, .tid = tid }, .{
30463046
.pre_ir_path = comp.verbose_llvm_ir,
30473047
.pre_bc_path = comp.verbose_llvm_bc,
30483048

src/Sema.zig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9705,7 +9705,6 @@ fn funcCommon(
97059705
func_inst,
97069706
cc_src,
97079707
is_noinline,
9708-
is_generic,
97099708
);
97109709
}
97119710

@@ -9745,7 +9744,6 @@ fn funcCommon(
97459744
func_inst,
97469745
cc_src,
97479746
is_noinline,
9748-
is_generic,
97499747
);
97509748
}
97519749

@@ -9762,7 +9760,6 @@ fn funcCommon(
97629760
func_inst,
97639761
cc_src,
97649762
is_noinline,
9765-
is_generic,
97669763
);
97679764
}
97689765

@@ -9779,7 +9776,6 @@ fn finishFunc(
97799776
func_inst: Zir.Inst.Index,
97809777
cc_src: LazySrcLoc,
97819778
is_noinline: bool,
9782-
is_generic: bool,
97839779
) CompileError!Air.Inst.Ref {
97849780
const pt = sema.pt;
97859781
const zcu = pt.zcu;
@@ -9911,13 +9907,6 @@ fn finishFunc(
99119907
}),
99129908
}
99139909

9914-
if (!is_generic and sema.wantErrorReturnTracing(return_type)) {
9915-
// Make sure that StackTrace's fields are resolved so that the backend can
9916-
// lower this fn type.
9917-
const unresolved_stack_trace_ty = try sema.getBuiltinType(block.nodeOffset(.zero), .StackTrace);
9918-
try unresolved_stack_trace_ty.resolveFields(pt);
9919-
}
9920-
99219910
return Air.internedToRef(if (opt_func_index != .none) opt_func_index else func_ty);
99229911
}
99239912

0 commit comments

Comments
 (0)