authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-12-28 16:42:54-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-01 19:49:08-07:00
logb8674910d45f0b87f82376abbd7a705ad77fe79a
treed4f5034d521dd0a54366860b7a1b0a862d877519
parent92cc2f41e6027a1e3bec7b3daa01da8dc90a9370

restore -fno-emit-bin -femit-llvm-ir functionality

Now, link.File will always be null when -fno-emit-bin is specified, and in the case that LLVM artifacts are still required, the Zcu instance has an LlvmObject.

3 files changed, 231 insertions(+), 169 deletions(-)

src/Compilation.zig+91-17
...@@ -39,6 +39,7 @@ const Zir = @import("Zir.zig");...@@ -39,6 +39,7 @@ const Zir = @import("Zir.zig");
39const Autodoc = @import("Autodoc.zig");39const Autodoc = @import("Autodoc.zig");
40const resinator = @import("resinator.zig");40const resinator = @import("resinator.zig");
41const Builtin = @import("Builtin.zig");41const Builtin = @import("Builtin.zig");
42const LlvmObject = @import("codegen/llvm.zig").Object;
4243
43pub const Config = @import("Compilation/Config.zig");44pub const Config = @import("Compilation/Config.zig");
4445
...@@ -1434,6 +1435,7 @@ pub fn create(gpa: Allocator, options: CreateOptions) !*Compilation {...@@ -1434,6 +1435,7 @@ pub fn create(gpa: Allocator, options: CreateOptions) !*Compilation {
1434 .emit_h = emit_h,1435 .emit_h = emit_h,
1435 .tmp_hack_arena = std.heap.ArenaAllocator.init(gpa),1436 .tmp_hack_arena = std.heap.ArenaAllocator.init(gpa),
1436 .error_limit = error_limit,1437 .error_limit = error_limit,
1438 .llvm_object = null,
1437 };1439 };
1438 try zcu.init();1440 try zcu.init();
1439 break :blk zcu;1441 break :blk zcu;
...@@ -1683,6 +1685,17 @@ pub fn create(gpa: Allocator, options: CreateOptions) !*Compilation {...@@ -1683,6 +1685,17 @@ pub fn create(gpa: Allocator, options: CreateOptions) !*Compilation {
1683 },1685 },
1684 }1686 }
16851687
1688 // Handle the case of e.g. -fno-emit-bin -femit-llvm-ir.
1689 if (options.emit_bin == null and (comp.verbose_llvm_ir != null or
1690 comp.verbose_llvm_bc != null or
1691 (use_llvm and comp.emit_asm != null) or
1692 comp.emit_llvm_ir != null or
1693 comp.emit_llvm_bc != null))
1694 {
1695 if (build_options.only_c) unreachable;
1696 if (opt_zcu) |zcu| zcu.llvm_object = try LlvmObject.create(arena, comp);
1697 }
1698
1686 comp.arena = arena_allocator;1699 comp.arena = arena_allocator;
1687 break :comp comp;1700 break :comp comp;
1688 };1701 };
...@@ -2016,6 +2029,12 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2016,6 +2029,12 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2016 const tracy_trace = trace(@src());2029 const tracy_trace = trace(@src());
2017 defer tracy_trace.end();2030 defer tracy_trace.end();
20182031
2032 // This arena is scoped to this one update.
2033 const gpa = comp.gpa;
2034 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
2035 defer arena_allocator.deinit();
2036 const arena = arena_allocator.allocator();
2037
2019 comp.clearMiscFailures();2038 comp.clearMiscFailures();
2020 comp.last_update_was_cache_hit = false;2039 comp.last_update_was_cache_hit = false;
20212040
...@@ -2034,7 +2053,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2034,7 +2053,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
20342053
2035 man = comp.cache_parent.obtain();2054 man = comp.cache_parent.obtain();
2036 whole.cache_manifest = &man;2055 whole.cache_manifest = &man;
2037 try comp.addNonIncrementalStuffToCacheManifest(&man);2056 try addNonIncrementalStuffToCacheManifest(comp, arena, &man);
20382057
2039 const is_hit = man.hit() catch |err| {2058 const is_hit = man.hit() catch |err| {
2040 const i = man.failed_file_index orelse return err;2059 const i = man.failed_file_index orelse return err;
...@@ -2065,8 +2084,8 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2065,8 +2084,8 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2065 tmp_dir_rand_int = std.crypto.random.int(u64);2084 tmp_dir_rand_int = std.crypto.random.int(u64);
2066 const tmp_dir_sub_path = "tmp" ++ s ++ Package.Manifest.hex64(tmp_dir_rand_int);2085 const tmp_dir_sub_path = "tmp" ++ s ++ Package.Manifest.hex64(tmp_dir_rand_int);
20672086
2068 const path = try comp.local_cache_directory.join(comp.gpa, &.{tmp_dir_sub_path});2087 const path = try comp.local_cache_directory.join(gpa, &.{tmp_dir_sub_path});
2069 errdefer comp.gpa.free(path);2088 errdefer gpa.free(path);
20702089
2071 const handle = try comp.local_cache_directory.handle.makeOpenPath(tmp_dir_sub_path, .{});2090 const handle = try comp.local_cache_directory.handle.makeOpenPath(tmp_dir_sub_path, .{});
2072 errdefer handle.close();2091 errdefer handle.close();
...@@ -2100,10 +2119,6 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2100,10 +2119,6 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2100 .directory = tmp_artifact_directory,2119 .directory = tmp_artifact_directory,
2101 .sub_path = std.fs.path.basename(sub_path),2120 .sub_path = std.fs.path.basename(sub_path),
2102 };2121 };
2103 // It's a bit strange to use the Compilation arena allocator here
2104 // but in practice it won't leak much and usually whole cache mode
2105 // will be combined with exactly one call to update().
2106 const arena = comp.arena.allocator();
2107 comp.bin_file = try link.File.createEmpty(arena, comp, emit, whole.lf_open_opts);2122 comp.bin_file = try link.File.createEmpty(arena, comp, emit, whole.lf_open_opts);
2108 }2123 }
2109 },2124 },
...@@ -2127,7 +2142,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2127,7 +2142,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2127 }2142 }
21282143
2129 if (comp.module) |module| {2144 if (comp.module) |module| {
2130 module.compile_log_text.shrinkAndFree(module.gpa, 0);2145 module.compile_log_text.shrinkAndFree(gpa, 0);
2131 module.generation += 1;2146 module.generation += 1;
21322147
2133 // Make sure std.zig is inside the import_table. We unconditionally need2148 // Make sure std.zig is inside the import_table. We unconditionally need
...@@ -2189,7 +2204,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2189,7 +2204,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2189 comp.root_name,2204 comp.root_name,
2190 @as(usize, @intFromPtr(module)),2205 @as(usize, @intFromPtr(module)),
2191 });2206 });
2192 module.intern_pool.dumpGenericInstances(comp.gpa);2207 module.intern_pool.dumpGenericInstances(gpa);
2193 }2208 }
21942209
2195 if (comp.config.is_test and comp.totalErrorCount() == 0) {2210 if (comp.config.is_test and comp.totalErrorCount() == 0) {
...@@ -2222,8 +2237,23 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2222,8 +2237,23 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2222 };2237 };
2223 }2238 }
22242239
2225 if (comp.module) |module| {2240 if (comp.module) |zcu| {
2226 try link.File.C.flushEmitH(module);2241 try link.File.C.flushEmitH(zcu);
2242
2243 if (zcu.llvm_object) |llvm_object| {
2244 if (build_options.only_c) unreachable;
2245 const default_emit = switch (comp.cache_use) {
2246 .whole => |whole| .{
2247 .directory = whole.tmp_artifact_directory.?,
2248 .sub_path = "dummy",
2249 },
2250 .incremental => |incremental| .{
2251 .directory = incremental.artifact_directory,
2252 .sub_path = "dummy",
2253 },
2254 };
2255 try emitLlvmObject(comp, arena, default_emit, null, llvm_object, main_progress_node);
2256 }
2227 }2257 }
2228 }2258 }
22292259
...@@ -2238,7 +2268,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void...@@ -2238,7 +2268,7 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
2238 // Close tmp dir and link.File to avoid open handle during rename.2268 // Close tmp dir and link.File to avoid open handle during rename.
2239 if (whole.tmp_artifact_directory) |*tmp_directory| {2269 if (whole.tmp_artifact_directory) |*tmp_directory| {
2240 tmp_directory.handle.close();2270 tmp_directory.handle.close();
2241 if (tmp_directory.path) |p| comp.gpa.free(p);2271 if (tmp_directory.path) |p| gpa.free(p);
2242 whole.tmp_artifact_directory = null;2272 whole.tmp_artifact_directory = null;
2243 } else unreachable;2273 } else unreachable;
22442274
...@@ -2389,13 +2419,13 @@ fn prepareWholeEmitSubPath(arena: Allocator, opt_emit: ?EmitLoc) error{OutOfMemo...@@ -2389,13 +2419,13 @@ fn prepareWholeEmitSubPath(arena: Allocator, opt_emit: ?EmitLoc) error{OutOfMemo
2389/// anything from the link cache manifest.2419/// anything from the link cache manifest.
2390pub const link_hash_implementation_version = 10;2420pub const link_hash_implementation_version = 10;
23912421
2392fn addNonIncrementalStuffToCacheManifest(comp: *Compilation, man: *Cache.Manifest) !void {2422fn addNonIncrementalStuffToCacheManifest(
2423 comp: *Compilation,
2424 arena: Allocator,
2425 man: *Cache.Manifest,
2426) !void {
2393 const gpa = comp.gpa;2427 const gpa = comp.gpa;
23942428
2395 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
2396 defer arena_allocator.deinit();
2397 const arena = arena_allocator.allocator();
2398
2399 comptime assert(link_hash_implementation_version == 10);2429 comptime assert(link_hash_implementation_version == 10);
24002430
2401 if (comp.module) |mod| {2431 if (comp.module) |mod| {
...@@ -2568,6 +2598,50 @@ fn emitOthers(comp: *Compilation) void {...@@ -2568,6 +2598,50 @@ fn emitOthers(comp: *Compilation) void {
2568 }2598 }
2569}2599}
25702600
2601pub fn emitLlvmObject(
2602 comp: *Compilation,
2603 arena: Allocator,
2604 default_emit: Emit,
2605 bin_emit_loc: ?EmitLoc,
2606 llvm_object: *LlvmObject,
2607 prog_node: *std.Progress.Node,
2608) !void {
2609 if (build_options.only_c) @compileError("unreachable");
2610
2611 var sub_prog_node = prog_node.start("LLVM Emit Object", 0);
2612 sub_prog_node.activate();
2613 sub_prog_node.context.refresh();
2614 defer sub_prog_node.end();
2615
2616 try llvm_object.emit(.{
2617 .pre_ir_path = comp.verbose_llvm_ir,
2618 .pre_bc_path = comp.verbose_llvm_bc,
2619 .bin_path = try resolveEmitLoc(arena, default_emit, bin_emit_loc),
2620 .asm_path = try resolveEmitLoc(arena, default_emit, comp.emit_asm),
2621 .post_ir_path = try resolveEmitLoc(arena, default_emit, comp.emit_llvm_ir),
2622 .post_bc_path = try resolveEmitLoc(arena, default_emit, comp.emit_llvm_bc),
2623
2624 .is_debug = comp.root_mod.optimize_mode == .Debug,
2625 .is_small = comp.root_mod.optimize_mode == .ReleaseSmall,
2626 .time_report = comp.time_report,
2627 .sanitize_thread = comp.config.any_sanitize_thread,
2628 .lto = comp.config.lto,
2629 });
2630}
2631
2632fn resolveEmitLoc(
2633 arena: Allocator,
2634 default_emit: Emit,
2635 opt_loc: ?EmitLoc,
2636) Allocator.Error!?[*:0]const u8 {
2637 const loc = opt_loc orelse return null;
2638 const slice = if (loc.directory) |directory|
2639 try directory.joinZ(arena, &.{loc.basename})
2640 else
2641 try default_emit.basenamePath(arena, loc.basename);
2642 return slice.ptr;
2643}
2644
2571fn reportMultiModuleErrors(mod: *Module) !void {2645fn reportMultiModuleErrors(mod: *Module) !void {
2572 // Some cases can give you a whole bunch of multi-module errors, which it's not helpful to2646 // Some cases can give you a whole bunch of multi-module errors, which it's not helpful to
2573 // print all of, so we'll cap the number of these to emit.2647 // print all of, so we'll cap the number of these to emit.
src/Module.zig+136-115
...@@ -37,6 +37,7 @@ const clang = @import("clang.zig");...@@ -37,6 +37,7 @@ const clang = @import("clang.zig");
37const InternPool = @import("InternPool.zig");37const InternPool = @import("InternPool.zig");
38const Alignment = InternPool.Alignment;38const Alignment = InternPool.Alignment;
39const BuiltinFn = std.zig.BuiltinFn;39const BuiltinFn = std.zig.BuiltinFn;
40const LlvmObject = @import("codegen/llvm.zig").Object;
4041
41comptime {42comptime {
42 @setEvalBranchQuota(4000);43 @setEvalBranchQuota(4000);
...@@ -53,6 +54,10 @@ comptime {...@@ -53,6 +54,10 @@ comptime {
53/// General-purpose allocator. Used for both temporary and long-term storage.54/// General-purpose allocator. Used for both temporary and long-term storage.
54gpa: Allocator,55gpa: Allocator,
55comp: *Compilation,56comp: *Compilation,
57/// Usually, the LlvmObject is managed by linker code, however, in the case
58/// that -fno-emit-bin is specified, the linker code never executes, so we
59/// store the LlvmObject here.
60llvm_object: ?*LlvmObject,
5661
57/// Pointer to externally managed resource.62/// Pointer to externally managed resource.
58root_mod: *Package.Module,63root_mod: *Package.Module,
...@@ -2476,36 +2481,41 @@ pub fn init(mod: *Module) !void {...@@ -2476,36 +2481,41 @@ pub fn init(mod: *Module) !void {
2476 try mod.global_error_set.put(gpa, .empty, {});2481 try mod.global_error_set.put(gpa, .empty, {});
2477}2482}
24782483
2479pub fn deinit(mod: *Module) void {2484pub fn deinit(zcu: *Zcu) void {
2480 const gpa = mod.gpa;2485 const gpa = zcu.gpa;
2486
2487 if (zcu.llvm_object) |llvm_object| {
2488 if (build_options.only_c) unreachable;
2489 llvm_object.deinit();
2490 }
24812491
2482 for (mod.import_table.keys()) |key| {2492 for (zcu.import_table.keys()) |key| {
2483 gpa.free(key);2493 gpa.free(key);
2484 }2494 }
2485 var failed_decls = mod.failed_decls;2495 var failed_decls = zcu.failed_decls;
2486 mod.failed_decls = .{};2496 zcu.failed_decls = .{};
2487 for (mod.import_table.values()) |value| {2497 for (zcu.import_table.values()) |value| {
2488 value.destroy(mod);2498 value.destroy(zcu);
2489 }2499 }
2490 mod.import_table.deinit(gpa);2500 zcu.import_table.deinit(gpa);
24912501
2492 for (mod.embed_table.keys(), mod.embed_table.values()) |path, embed_file| {2502 for (zcu.embed_table.keys(), zcu.embed_table.values()) |path, embed_file| {
2493 gpa.free(path);2503 gpa.free(path);
2494 gpa.destroy(embed_file);2504 gpa.destroy(embed_file);
2495 }2505 }
2496 mod.embed_table.deinit(gpa);2506 zcu.embed_table.deinit(gpa);
24972507
2498 mod.compile_log_text.deinit(gpa);2508 zcu.compile_log_text.deinit(gpa);
24992509
2500 mod.local_zir_cache.handle.close();2510 zcu.local_zir_cache.handle.close();
2501 mod.global_zir_cache.handle.close();2511 zcu.global_zir_cache.handle.close();
25022512
2503 for (failed_decls.values()) |value| {2513 for (failed_decls.values()) |value| {
2504 value.destroy(gpa);2514 value.destroy(gpa);
2505 }2515 }
2506 failed_decls.deinit(gpa);2516 failed_decls.deinit(gpa);
25072517
2508 if (mod.emit_h) |emit_h| {2518 if (zcu.emit_h) |emit_h| {
2509 for (emit_h.failed_decls.values()) |value| {2519 for (emit_h.failed_decls.values()) |value| {
2510 value.destroy(gpa);2520 value.destroy(gpa);
2511 }2521 }
...@@ -2514,68 +2524,68 @@ pub fn deinit(mod: *Module) void {...@@ -2514,68 +2524,68 @@ pub fn deinit(mod: *Module) void {
2514 emit_h.allocated_emit_h.deinit(gpa);2524 emit_h.allocated_emit_h.deinit(gpa);
2515 }2525 }
25162526
2517 for (mod.failed_files.values()) |value| {2527 for (zcu.failed_files.values()) |value| {
2518 if (value) |msg| msg.destroy(gpa);2528 if (value) |msg| msg.destroy(gpa);
2519 }2529 }
2520 mod.failed_files.deinit(gpa);2530 zcu.failed_files.deinit(gpa);
25212531
2522 for (mod.failed_embed_files.values()) |msg| {2532 for (zcu.failed_embed_files.values()) |msg| {
2523 msg.destroy(gpa);2533 msg.destroy(gpa);
2524 }2534 }
2525 mod.failed_embed_files.deinit(gpa);2535 zcu.failed_embed_files.deinit(gpa);
25262536
2527 for (mod.failed_exports.values()) |value| {2537 for (zcu.failed_exports.values()) |value| {
2528 value.destroy(gpa);2538 value.destroy(gpa);
2529 }2539 }
2530 mod.failed_exports.deinit(gpa);2540 zcu.failed_exports.deinit(gpa);
25312541
2532 for (mod.cimport_errors.values()) |*errs| {2542 for (zcu.cimport_errors.values()) |*errs| {
2533 errs.deinit(gpa);2543 errs.deinit(gpa);
2534 }2544 }
2535 mod.cimport_errors.deinit(gpa);2545 zcu.cimport_errors.deinit(gpa);
25362546
2537 mod.compile_log_decls.deinit(gpa);2547 zcu.compile_log_decls.deinit(gpa);
25382548
2539 for (mod.decl_exports.values()) |*export_list| {2549 for (zcu.decl_exports.values()) |*export_list| {
2540 export_list.deinit(gpa);2550 export_list.deinit(gpa);
2541 }2551 }
2542 mod.decl_exports.deinit(gpa);2552 zcu.decl_exports.deinit(gpa);
25432553
2544 for (mod.value_exports.values()) |*export_list| {2554 for (zcu.value_exports.values()) |*export_list| {
2545 export_list.deinit(gpa);2555 export_list.deinit(gpa);
2546 }2556 }
2547 mod.value_exports.deinit(gpa);2557 zcu.value_exports.deinit(gpa);
25482558
2549 for (mod.export_owners.values()) |*value| {2559 for (zcu.export_owners.values()) |*value| {
2550 freeExportList(gpa, value);2560 freeExportList(gpa, value);
2551 }2561 }
2552 mod.export_owners.deinit(gpa);2562 zcu.export_owners.deinit(gpa);
25532563
2554 mod.global_error_set.deinit(gpa);2564 zcu.global_error_set.deinit(gpa);
25552565
2556 mod.test_functions.deinit(gpa);2566 zcu.test_functions.deinit(gpa);
25572567
2558 for (mod.global_assembly.values()) |s| {2568 for (zcu.global_assembly.values()) |s| {
2559 gpa.free(s);2569 gpa.free(s);
2560 }2570 }
2561 mod.global_assembly.deinit(gpa);2571 zcu.global_assembly.deinit(gpa);
25622572
2563 mod.reference_table.deinit(gpa);2573 zcu.reference_table.deinit(gpa);
25642574
2565 {2575 {
2566 var it = mod.intern_pool.allocated_namespaces.iterator(0);2576 var it = zcu.intern_pool.allocated_namespaces.iterator(0);
2567 while (it.next()) |namespace| {2577 while (it.next()) |namespace| {
2568 namespace.decls.deinit(gpa);2578 namespace.decls.deinit(gpa);
2569 namespace.usingnamespace_set.deinit(gpa);2579 namespace.usingnamespace_set.deinit(gpa);
2570 }2580 }
2571 }2581 }
25722582
2573 mod.intern_pool.deinit(gpa);2583 zcu.intern_pool.deinit(gpa);
2574 mod.tmp_hack_arena.deinit();2584 zcu.tmp_hack_arena.deinit();
25752585
2576 mod.capture_scope_parents.deinit(gpa);2586 zcu.capture_scope_parents.deinit(gpa);
2577 mod.runtime_capture_scopes.deinit(gpa);2587 zcu.runtime_capture_scopes.deinit(gpa);
2578 mod.comptime_capture_scopes.deinit(gpa);2588 zcu.comptime_capture_scopes.deinit(gpa);
2579}2589}
25802590
2581pub fn destroyDecl(mod: *Module, decl_index: Decl.Index) void {2591pub fn destroyDecl(mod: *Module, decl_index: Decl.Index) void {
...@@ -3222,14 +3232,14 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void {...@@ -3222,14 +3232,14 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void {
3222 }3232 }
3223}3233}
32243234
3225pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaError!void {3235pub fn ensureFuncBodyAnalyzed(zcu: *Zcu, func_index: InternPool.Index) SemaError!void {
3226 const tracy = trace(@src());3236 const tracy = trace(@src());
3227 defer tracy.end();3237 defer tracy.end();
32283238
3229 const ip = &mod.intern_pool;3239 const ip = &zcu.intern_pool;
3230 const func = mod.funcInfo(func_index);3240 const func = zcu.funcInfo(func_index);
3231 const decl_index = func.owner_decl;3241 const decl_index = func.owner_decl;
3232 const decl = mod.declPtr(decl_index);3242 const decl = zcu.declPtr(decl_index);
32333243
3234 switch (decl.analysis) {3244 switch (decl.analysis) {
3235 .unreferenced => unreachable,3245 .unreferenced => unreachable,
...@@ -3253,13 +3263,13 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr...@@ -3253,13 +3263,13 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr
3253 .success => return,3263 .success => return,
3254 }3264 }
32553265
3256 const gpa = mod.gpa;3266 const gpa = zcu.gpa;
32573267
3258 var tmp_arena = std.heap.ArenaAllocator.init(gpa);3268 var tmp_arena = std.heap.ArenaAllocator.init(gpa);
3259 defer tmp_arena.deinit();3269 defer tmp_arena.deinit();
3260 const sema_arena = tmp_arena.allocator();3270 const sema_arena = tmp_arena.allocator();
32613271
3262 var air = mod.analyzeFnBody(func_index, sema_arena) catch |err| switch (err) {3272 var air = zcu.analyzeFnBody(func_index, sema_arena) catch |err| switch (err) {
3263 error.AnalysisFail => {3273 error.AnalysisFail => {
3264 if (func.analysis(ip).state == .in_progress) {3274 if (func.analysis(ip).state == .in_progress) {
3265 // If this decl caused the compile error, the analysis field would3275 // If this decl caused the compile error, the analysis field would
...@@ -3273,25 +3283,22 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr...@@ -3273,25 +3283,22 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr
3273 };3283 };
3274 defer air.deinit(gpa);3284 defer air.deinit(gpa);
32753285
3276 const comp = mod.comp;3286 const comp = zcu.comp;
3277
3278 const no_bin_file = (comp.bin_file == null and
3279 comp.emit_asm == null and
3280 comp.emit_llvm_ir == null and
3281 comp.emit_llvm_bc == null);
32823287
3283 const dump_air = builtin.mode == .Debug and comp.verbose_air;3288 const dump_air = builtin.mode == .Debug and comp.verbose_air;
3284 const dump_llvm_ir = builtin.mode == .Debug and (comp.verbose_llvm_ir != null or comp.verbose_llvm_bc != null);3289 const dump_llvm_ir = builtin.mode == .Debug and (comp.verbose_llvm_ir != null or comp.verbose_llvm_bc != null);
32853290
3286 if (no_bin_file and !dump_air and !dump_llvm_ir) return;3291 if (comp.bin_file == null and zcu.llvm_object == null and !dump_air and !dump_llvm_ir) {
3292 return;
3293 }
32873294
3288 var liveness = try Liveness.analyze(gpa, air, ip);3295 var liveness = try Liveness.analyze(gpa, air, ip);
3289 defer liveness.deinit(gpa);3296 defer liveness.deinit(gpa);
32903297
3291 if (dump_air) {3298 if (dump_air) {
3292 const fqn = try decl.getFullyQualifiedName(mod);3299 const fqn = try decl.getFullyQualifiedName(zcu);
3293 std.debug.print("# Begin Function AIR: {}:\n", .{fqn.fmt(ip)});3300 std.debug.print("# Begin Function AIR: {}:\n", .{fqn.fmt(ip)});
3294 @import("print_air.zig").dump(mod, air, liveness);3301 @import("print_air.zig").dump(zcu, air, liveness);
3295 std.debug.print("# End Function AIR: {}\n\n", .{fqn.fmt(ip)});3302 std.debug.print("# End Function AIR: {}\n\n", .{fqn.fmt(ip)});
3296 }3303 }
32973304
...@@ -3307,12 +3314,12 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr...@@ -3307,12 +3314,12 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr
3307 verify.verify() catch |err| switch (err) {3314 verify.verify() catch |err| switch (err) {
3308 error.OutOfMemory => return error.OutOfMemory,3315 error.OutOfMemory => return error.OutOfMemory,
3309 else => {3316 else => {
3310 try mod.failed_decls.ensureUnusedCapacity(gpa, 1);3317 try zcu.failed_decls.ensureUnusedCapacity(gpa, 1);
3311 mod.failed_decls.putAssumeCapacityNoClobber(3318 zcu.failed_decls.putAssumeCapacityNoClobber(
3312 decl_index,3319 decl_index,
3313 try Module.ErrorMsg.create(3320 try Module.ErrorMsg.create(
3314 gpa,3321 gpa,
3315 decl.srcLoc(mod),3322 decl.srcLoc(zcu),
3316 "invalid liveness: {s}",3323 "invalid liveness: {s}",
3317 .{@errorName(err)},3324 .{@errorName(err)},
3318 ),3325 ),
...@@ -3323,28 +3330,32 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr...@@ -3323,28 +3330,32 @@ pub fn ensureFuncBodyAnalyzed(mod: *Module, func_index: InternPool.Index) SemaEr
3323 };3330 };
3324 }3331 }
33253332
3326 if (no_bin_file and !dump_llvm_ir) return;3333 if (comp.bin_file) |lf| {
33273334 lf.updateFunc(zcu, func_index, air, liveness) catch |err| switch (err) {
3328 const lf = comp.bin_file.?;3335 error.OutOfMemory => return error.OutOfMemory,
3329 lf.updateFunc(mod, func_index, air, liveness) catch |err| switch (err) {3336 error.AnalysisFail => {
3330 error.OutOfMemory => return error.OutOfMemory,3337 decl.analysis = .codegen_failure;
3331 error.AnalysisFail => {3338 },
3332 decl.analysis = .codegen_failure;3339 else => {
3333 return;3340 try zcu.failed_decls.ensureUnusedCapacity(gpa, 1);
3334 },3341 zcu.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create(
3335 else => {3342 gpa,
3336 try mod.failed_decls.ensureUnusedCapacity(gpa, 1);3343 decl.srcLoc(zcu),
3337 mod.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create(3344 "unable to codegen: {s}",
3338 gpa,3345 .{@errorName(err)},
3339 decl.srcLoc(mod),3346 ));
3340 "unable to codegen: {s}",3347 decl.analysis = .codegen_failure_retryable;
3341 .{@errorName(err)},3348 },
3342 ));3349 };
3343 decl.analysis = .codegen_failure_retryable;3350 } else if (zcu.llvm_object) |llvm_object| {
3344 return;3351 if (build_options.only_c) unreachable;
3345 },3352 llvm_object.updateFunc(zcu, func_index, air, liveness) catch |err| switch (err) {
3346 };3353 error.OutOfMemory => return error.OutOfMemory,
3347 return;3354 error.AnalysisFail => {
3355 decl.analysis = .codegen_failure;
3356 },
3357 };
3358 }
3348 },3359 },
3349 }3360 }
3350}3361}
...@@ -5235,44 +5246,57 @@ pub fn processExports(mod: *Module) !void {...@@ -5235,44 +5246,57 @@ pub fn processExports(mod: *Module) !void {
5235const SymbolExports = std.AutoArrayHashMapUnmanaged(InternPool.NullTerminatedString, *Export);5246const SymbolExports = std.AutoArrayHashMapUnmanaged(InternPool.NullTerminatedString, *Export);
52365247
5237fn processExportsInner(5248fn processExportsInner(
5238 mod: *Module,5249 zcu: *Zcu,
5239 symbol_exports: *SymbolExports,5250 symbol_exports: *SymbolExports,
5240 exported: Exported,5251 exported: Exported,
5241 exports: []const *Export,5252 exports: []const *Export,
5242) error{OutOfMemory}!void {5253) error{OutOfMemory}!void {
5243 const gpa = mod.gpa;5254 const gpa = zcu.gpa;
52445255
5245 for (exports) |new_export| {5256 for (exports) |new_export| {
5246 const gop = try symbol_exports.getOrPut(gpa, new_export.opts.name);5257 const gop = try symbol_exports.getOrPut(gpa, new_export.opts.name);
5247 if (gop.found_existing) {5258 if (gop.found_existing) {
5248 new_export.status = .failed_retryable;5259 new_export.status = .failed_retryable;
5249 try mod.failed_exports.ensureUnusedCapacity(gpa, 1);5260 try zcu.failed_exports.ensureUnusedCapacity(gpa, 1);
5250 const src_loc = new_export.getSrcLoc(mod);5261 const src_loc = new_export.getSrcLoc(zcu);
5251 const msg = try ErrorMsg.create(gpa, src_loc, "exported symbol collision: {}", .{5262 const msg = try ErrorMsg.create(gpa, src_loc, "exported symbol collision: {}", .{
5252 new_export.opts.name.fmt(&mod.intern_pool),5263 new_export.opts.name.fmt(&zcu.intern_pool),
5253 });5264 });
5254 errdefer msg.destroy(gpa);5265 errdefer msg.destroy(gpa);
5255 const other_export = gop.value_ptr.*;5266 const other_export = gop.value_ptr.*;
5256 const other_src_loc = other_export.getSrcLoc(mod);5267 const other_src_loc = other_export.getSrcLoc(zcu);
5257 try mod.errNoteNonLazy(other_src_loc, msg, "other symbol here", .{});5268 try zcu.errNoteNonLazy(other_src_loc, msg, "other symbol here", .{});
5258 mod.failed_exports.putAssumeCapacityNoClobber(new_export, msg);5269 zcu.failed_exports.putAssumeCapacityNoClobber(new_export, msg);
5259 new_export.status = .failed;5270 new_export.status = .failed;
5260 } else {5271 } else {
5261 gop.value_ptr.* = new_export;5272 gop.value_ptr.* = new_export;
5262 }5273 }
5263 }5274 }
5264 const lf = mod.comp.bin_file orelse return;5275 if (zcu.comp.bin_file) |lf| {
5265 lf.updateExports(mod, exported, exports) catch |err| switch (err) {5276 try handleUpdateExports(zcu, exports, lf.updateExports(zcu, exported, exports));
5277 } else if (zcu.llvm_object) |llvm_object| {
5278 if (build_options.only_c) unreachable;
5279 try handleUpdateExports(zcu, exports, llvm_object.updateExports(zcu, exported, exports));
5280 }
5281}
5282
5283fn handleUpdateExports(
5284 zcu: *Zcu,
5285 exports: []const *Export,
5286 result: link.File.UpdateExportsError!void,
5287) Allocator.Error!void {
5288 const gpa = zcu.gpa;
5289 result catch |err| switch (err) {
5266 error.OutOfMemory => return error.OutOfMemory,5290 error.OutOfMemory => return error.OutOfMemory,
5267 else => {5291 error.AnalysisFail => {
5268 const new_export = exports[0];5292 const new_export = exports[0];
5269 new_export.status = .failed_retryable;5293 new_export.status = .failed_retryable;
5270 try mod.failed_exports.ensureUnusedCapacity(gpa, 1);5294 try zcu.failed_exports.ensureUnusedCapacity(gpa, 1);
5271 const src_loc = new_export.getSrcLoc(mod);5295 const src_loc = new_export.getSrcLoc(zcu);
5272 const msg = try ErrorMsg.create(gpa, src_loc, "unable to export: {s}", .{5296 const msg = try ErrorMsg.create(gpa, src_loc, "unable to export: {s}", .{
5273 @errorName(err),5297 @errorName(err),
5274 });5298 });
5275 mod.failed_exports.putAssumeCapacityNoClobber(new_export, msg);5299 zcu.failed_exports.putAssumeCapacityNoClobber(new_export, msg);
5276 },5300 },
5277 };5301 };
5278}5302}
...@@ -5415,41 +5439,38 @@ pub fn populateTestFunctions(...@@ -5415,41 +5439,38 @@ pub fn populateTestFunctions(
5415 try mod.linkerUpdateDecl(decl_index);5439 try mod.linkerUpdateDecl(decl_index);
5416}5440}
54175441
5418pub fn linkerUpdateDecl(mod: *Module, decl_index: Decl.Index) !void {5442pub fn linkerUpdateDecl(zcu: *Zcu, decl_index: Decl.Index) !void {
5419 const comp = mod.comp;5443 const comp = zcu.comp;
54205444
5421 if (comp.bin_file) |lf| {5445 if (comp.bin_file) |lf| {
5422 const decl = mod.declPtr(decl_index);5446 lf.updateDecl(zcu, decl_index) catch |err| switch (err) {
5423 lf.updateDecl(mod, decl_index) catch |err| switch (err) {
5424 error.OutOfMemory => return error.OutOfMemory,5447 error.OutOfMemory => return error.OutOfMemory,
5425 error.AnalysisFail => {5448 error.AnalysisFail => {
5449 const decl = zcu.declPtr(decl_index);
5426 decl.analysis = .codegen_failure;5450 decl.analysis = .codegen_failure;
5427 return;
5428 },5451 },
5429 else => {5452 else => {
5430 const gpa = mod.gpa;5453 const decl = zcu.declPtr(decl_index);
5431 try mod.failed_decls.ensureUnusedCapacity(gpa, 1);5454 const gpa = zcu.gpa;
5432 mod.failed_decls.putAssumeCapacityNoClobber(decl_index, try ErrorMsg.create(5455 try zcu.failed_decls.ensureUnusedCapacity(gpa, 1);
5456 zcu.failed_decls.putAssumeCapacityNoClobber(decl_index, try ErrorMsg.create(
5433 gpa,5457 gpa,
5434 decl.srcLoc(mod),5458 decl.srcLoc(zcu),
5435 "unable to codegen: {s}",5459 "unable to codegen: {s}",
5436 .{@errorName(err)},5460 .{@errorName(err)},
5437 ));5461 ));
5438 decl.analysis = .codegen_failure_retryable;5462 decl.analysis = .codegen_failure_retryable;
5439 return;
5440 },5463 },
5441 };5464 };
5442 } else {5465 } else if (zcu.llvm_object) |llvm_object| {
5443 const dump_llvm_ir = builtin.mode == .Debug and5466 if (build_options.only_c) unreachable;
5444 (comp.verbose_llvm_ir != null or comp.verbose_llvm_bc != null);5467 llvm_object.updateDecl(zcu, decl_index) catch |err| switch (err) {
54455468 error.OutOfMemory => return error.OutOfMemory,
5446 if (comp.emit_asm != null or5469 error.AnalysisFail => {
5447 comp.emit_llvm_ir != null or5470 const decl = zcu.declPtr(decl_index);
5448 comp.emit_llvm_bc != null or5471 decl.analysis = .codegen_failure;
5449 dump_llvm_ir)5472 },
5450 {5473 };
5451 @panic("TODO handle emit_asm, emit_llvm_ir, and emit_llvm_bc along with -fno-emit-bin");
5452 }
5453 }5474 }
5454}5475}
54555476
src/link.zig+4-37
...@@ -984,49 +984,16 @@ pub const File = struct {...@@ -984,49 +984,16 @@ pub const File = struct {
984 return output_mode == .Lib and !self.isStatic();984 return output_mode == .Lib and !self.isStatic();
985 }985 }
986986
987 pub fn resolveEmitLoc(
988 base: File,
989 arena: Allocator,
990 opt_loc: ?Compilation.EmitLoc,
991 ) Allocator.Error!?[*:0]const u8 {
992 const loc = opt_loc orelse return null;
993 const slice = if (loc.directory) |directory|
994 try directory.joinZ(arena, &.{loc.basename})
995 else
996 try base.emit.basenamePath(arena, loc.basename);
997 return slice.ptr;
998 }
999
1000 pub fn emitLlvmObject(987 pub fn emitLlvmObject(
1001 base: File,988 base: File,
1002 arena: Allocator,989 arena: Allocator,
1003 llvm_object: *LlvmObject,990 llvm_object: *LlvmObject,
1004 prog_node: *std.Progress.Node,991 prog_node: *std.Progress.Node,
1005 ) !void {992 ) !void {
1006 const comp = base.comp;993 return base.comp.emitLlvmObject(arena, base.emit, .{
1007994 .directory = null,
1008 var sub_prog_node = prog_node.start("LLVM Emit Object", 0);995 .basename = base.zcu_object_sub_path.?,
1009 sub_prog_node.activate();996 }, llvm_object, prog_node);
1010 sub_prog_node.context.refresh();
1011 defer sub_prog_node.end();
1012
1013 try llvm_object.emit(.{
1014 .pre_ir_path = comp.verbose_llvm_ir,
1015 .pre_bc_path = comp.verbose_llvm_bc,
1016 .bin_path = try base.resolveEmitLoc(arena, .{
1017 .directory = null,
1018 .basename = base.zcu_object_sub_path.?,
1019 }),
1020 .asm_path = try base.resolveEmitLoc(arena, comp.emit_asm),
1021 .post_ir_path = try base.resolveEmitLoc(arena, comp.emit_llvm_ir),
1022 .post_bc_path = try base.resolveEmitLoc(arena, comp.emit_llvm_bc),
1023
1024 .is_debug = comp.root_mod.optimize_mode == .Debug,
1025 .is_small = comp.root_mod.optimize_mode == .ReleaseSmall,
1026 .time_report = comp.time_report,
1027 .sanitize_thread = comp.config.any_sanitize_thread,
1028 .lto = comp.config.lto,
1029 });
1030 }997 }
1031998
1032 pub const C = @import("link/C.zig");999 pub const C = @import("link/C.zig");