Commit f54471b54c471bb6f8e51a1383be09d01c24d0c3 | zig

src/Builtin.zig+60-2

...	@@ -20,8 +20,11 @@ wasi_exec_model: std.builtin.WasiExecModel,	...	@@ -20,8 +20,11 @@ wasi_exec_model: std.builtin.WasiExecModel,
20		20
21	pub fn generate(opts: @This(), allocator: Allocator) Allocator.Error![:0]u8 {	21	pub fn generate(opts: @This(), allocator: Allocator) Allocator.Error![:0]u8 {
22	var buffer = std.ArrayList(u8).init(allocator);	22	var buffer = std.ArrayList(u8).init(allocator);
23	defer buffer.deinit();	23	try append(opts, &buffer);
		24	return buffer.toOwnedSliceSentinel(0);
		25	}
24		26
		27	pub fn append(opts: @This(), buffer: *std.ArrayList(u8)) Allocator.Error!void {
25	const target = opts.target;	28	const target = opts.target;
26	const generic_arch_name = target.cpu.arch.genericName();	29	const generic_arch_name = target.cpu.arch.genericName();
27	const zig_backend = opts.zig_backend;	30	const zig_backend = opts.zig_backend;
...	@@ -231,10 +234,65 @@ pub fn generate(opts: @This(), allocator: Allocator) Allocator.Error![:0]u8 {	...	@@ -231,10 +234,65 @@ pub fn generate(opts: @This(), allocator: Allocator) Allocator.Error![:0]u8 {
231	);	234	);
232	}	235	}
233	}	236	}
		237	}
234		238
235	return buffer.toOwnedSliceSentinel(0);	239	pub fn populateFile(comp: Compilation, mod: Module, file: *File) !void {
		240	assert(file.source_loaded == true);
		241
		242	if (mod.root.statFile(mod.root_src_path)) \|stat\| {
		243	if (stat.size != file.source.len) {
		244	std.log.warn(
		245	"the cached file '{}{s}' had the wrong size. Expected {d}, found {d}. " ++
		246	"Overwriting with correct file contents now",
		247	.{ mod.root, mod.root_src_path, file.source.len, stat.size },
		248	);
		249
		250	try writeFile(file, mod);
		251	} else {
		252	file.stat = .{
		253	.size = stat.size,
		254	.inode = stat.inode,
		255	.mtime = stat.mtime,
		256	};
		257	}
		258	} else \|err\| switch (err) {
		259	error.BadPathName => unreachable, // it's always "builtin.zig"
		260	error.NameTooLong => unreachable, // it's always "builtin.zig"
		261	error.PipeBusy => unreachable, // it's not a pipe
		262	error.WouldBlock => unreachable, // not asking for non-blocking I/O
		263
		264	error.FileNotFound => try writeFile(file, mod),
		265
		266	else => \|e\| return e,
		267	}
		268
		269	file.tree = try std.zig.Ast.parse(comp.gpa, file.source, .zig);
		270	file.tree_loaded = true;
		271	assert(file.tree.errors.len == 0); // builtin.zig must parse
		272
		273	file.zir = try AstGen.generate(comp.gpa, file.tree);
		274	file.zir_loaded = true;
		275	file.status = .success_zir;
		276	}
		277
		278	fn writeFile(file: File, mod: Module) !void {
		279	var af = try mod.root.atomicFile(mod.root_src_path, .{});
		280	defer af.deinit();
		281	try af.file.writeAll(file.source);
		282	try af.finish();
		283
		284	file.stat = .{
		285	.size = file.source.len,
		286	.inode = 0, // dummy value
		287	.mtime = 0, // dummy value
		288	};
236	}	289	}
237		290
238	const std = @import("std");	291	const std = @import("std");
239	const Allocator = std.mem.Allocator;	292	const Allocator = std.mem.Allocator;
240	const build_options = @import("build_options");	293	const build_options = @import("build_options");
		294	const Module = @import("Package/Module.zig");
		295	const assert = std.debug.assert;
		296	const AstGen = @import("AstGen.zig");
		297	const File = @import("Module.zig").File;
		298	const Compilation = @import("Compilation.zig");

src/Compilation.zig+103-80

...	@@ -37,6 +37,7 @@ const Zir = @import("Zir.zig");	...	@@ -37,6 +37,7 @@ const Zir = @import("Zir.zig");
37	const Autodoc = @import("Autodoc.zig");	37	const Autodoc = @import("Autodoc.zig");
38	const Color = @import("main.zig").Color;	38	const Color = @import("main.zig").Color;
39	const resinator = @import("resinator.zig");	39	const resinator = @import("resinator.zig");
		40	const Builtin = @import("Builtin.zig");
40		41
41	pub const Config = @import("Compilation/Config.zig");	42	pub const Config = @import("Compilation/Config.zig");
42		43
...	@@ -59,7 +60,10 @@ root_mod: *Package.Module,	...	@@ -59,7 +60,10 @@ root_mod: *Package.Module,
59	/// User-specified settings that have all the defaults resolved into concrete values.	60	/// User-specified settings that have all the defaults resolved into concrete values.
60	config: Config,	61	config: Config,
61		62
62	/// This is `null` when `-fno-emit-bin` is used.	63	/// The main output file.
		64	/// In whole cache mode, this is null except for during the body of the update
		65	/// function. In incremental cache mode, this is a long-lived object.
		66	/// In both cases, this is `null` when `-fno-emit-bin` is used.
63	bin_file: ?*link.File,	67	bin_file: ?*link.File,
64		68
65	/// The root path for the dynamic linker and system libraries (as well as frameworks on Darwin)	69	/// The root path for the dynamic linker and system libraries (as well as frameworks on Darwin)
...	@@ -80,6 +84,8 @@ version: ?std.SemanticVersion,	...	@@ -80,6 +84,8 @@ version: ?std.SemanticVersion,
80	libc_installation: ?*const LibCInstallation,	84	libc_installation: ?*const LibCInstallation,
81	skip_linker_dependencies: bool,	85	skip_linker_dependencies: bool,
82	no_builtin: bool,	86	no_builtin: bool,
		87	function_sections: bool,
		88	data_sections: bool,
83		89
84	c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .{},	90	c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .{},
85	win32_resource_table: if (build_options.only_core_functionality) void else std.AutoArrayHashMapUnmanaged(*Win32Resource, void) =	91	win32_resource_table: if (build_options.only_core_functionality) void else std.AutoArrayHashMapUnmanaged(*Win32Resource, void) =
...	@@ -120,7 +126,6 @@ failed_win32_resources: if (build_options.only_core_functionality) void else std	...	@@ -120,7 +126,6 @@ failed_win32_resources: if (build_options.only_core_functionality) void else std
120	/// Miscellaneous things that can fail.	126	/// Miscellaneous things that can fail.
121	misc_failures: std.AutoArrayHashMapUnmanaged(MiscTask, MiscError) = .{},	127	misc_failures: std.AutoArrayHashMapUnmanaged(MiscTask, MiscError) = .{},
122		128
123	keep_source_files_loaded: bool,
124	/// When this is `true` it means invoking clang as a sub-process is expected to inherit	129	/// When this is `true` it means invoking clang as a sub-process is expected to inherit
125	/// stdin, stdout, stderr, and if it returns non success, to forward the exit code.	130	/// stdin, stdout, stderr, and if it returns non success, to forward the exit code.
126	/// Otherwise we attempt to parse the error messages and expose them via the Compilation API.	131	/// Otherwise we attempt to parse the error messages and expose them via the Compilation API.
...	@@ -144,6 +149,7 @@ debug_compiler_runtime_libs: bool,	...	@@ -144,6 +149,7 @@ debug_compiler_runtime_libs: bool,
144	debug_compile_errors: bool,	149	debug_compile_errors: bool,
145	job_queued_compiler_rt_lib: bool = false,	150	job_queued_compiler_rt_lib: bool = false,
146	job_queued_compiler_rt_obj: bool = false,	151	job_queued_compiler_rt_obj: bool = false,
		152	job_queued_update_builtin_zig: bool,
147	alloc_failure_occurred: bool = false,	153	alloc_failure_occurred: bool = false,
148	formatted_panics: bool = false,	154	formatted_panics: bool = false,
149	last_update_was_cache_hit: bool = false,	155	last_update_was_cache_hit: bool = false,
...	@@ -814,13 +820,13 @@ pub const cache_helpers = struct {	...	@@ -814,13 +820,13 @@ pub const cache_helpers = struct {
814	addEmitLoc(hh, optional_emit_loc orelse return);	820	addEmitLoc(hh, optional_emit_loc orelse return);
815	}	821	}
816		822
817	pub fn addOptionalDebugFormat(hh: *Cache.HashHelper, x: ?link.File.DebugFormat) void {	823	pub fn addOptionalDebugFormat(hh: *Cache.HashHelper, x: ?Config.DebugFormat) void {
818	hh.add(x != null);	824	hh.add(x != null);
819	addDebugFormat(hh, x orelse return);	825	addDebugFormat(hh, x orelse return);
820	}	826	}
821		827
822	pub fn addDebugFormat(hh: *Cache.HashHelper, x: link.File.DebugFormat) void {	828	pub fn addDebugFormat(hh: *Cache.HashHelper, x: Config.DebugFormat) void {
823	const tag: @typeInfo(link.File.DebugFormat).Union.tag_type.? = x;	829	const tag: @typeInfo(Config.DebugFormat).Union.tag_type.? = x;
824	hh.add(tag);	830	hh.add(tag);
825	switch (x) {	831	switch (x) {
826	.strip, .code_view => {},	832	.strip, .code_view => {},
...	@@ -860,11 +866,11 @@ pub const SystemLib = link.SystemLib;	...	@@ -860,11 +866,11 @@ pub const SystemLib = link.SystemLib;
860		866
861	pub const CacheMode = enum { incremental, whole };	867	pub const CacheMode = enum { incremental, whole };
862		868
863	pub const CacheUse = union(CacheMode) {	869	const CacheUse = union(CacheMode) {
864	incremental: *Incremental,	870	incremental: *Incremental,
865	whole: *Whole,	871	whole: *Whole,
866		872
867	pub const Whole = struct {	873	const Whole = struct {
868	/// This is a pointer to a local variable inside `update()`.	874	/// This is a pointer to a local variable inside `update()`.
869	cache_manifest: ?*Cache.Manifest = null,	875	cache_manifest: ?*Cache.Manifest = null,
870	cache_manifest_mutex: std.Thread.Mutex = .{},	876	cache_manifest_mutex: std.Thread.Mutex = .{},
...	@@ -873,12 +879,14 @@ pub const CacheUse = union(CacheMode) {	...	@@ -873,12 +879,14 @@ pub const CacheUse = union(CacheMode) {
873	/// of exactly the correct size for "o/[digest]/[basename]".	879	/// of exactly the correct size for "o/[digest]/[basename]".
874	/// The basename is of the outputted binary file in case we don't know the directory yet.	880	/// The basename is of the outputted binary file in case we don't know the directory yet.
875	bin_sub_path: ?[]u8,	881	bin_sub_path: ?[]u8,
876	/// Same as `whole_bin_sub_path` but for implibs.	882	/// Same as `bin_sub_path` but for implibs.
877	implib_sub_path: ?[]u8,	883	implib_sub_path: ?[]u8,
878	docs_sub_path: ?[]u8,	884	docs_sub_path: ?[]u8,
		885	lf_open_opts: link.File.OpenOptions,
		886	tmp_artifact_directory: ?Cache.Directory,
879	};	887	};
880		888
881	pub const Incremental = struct {	889	const Incremental = struct {
882	/// Where build artifacts and incremental compilation metadata serialization go.	890	/// Where build artifacts and incremental compilation metadata serialization go.
883	artifact_directory: Compilation.Directory,	891	artifact_directory: Compilation.Directory,
884	};	892	};
...	@@ -937,7 +945,6 @@ pub const InitOptions = struct {	...	@@ -937,7 +945,6 @@ pub const InitOptions = struct {
937	/// this flag would be set to disable this machinery to avoid false positives.	945	/// this flag would be set to disable this machinery to avoid false positives.
938	disable_lld_caching: bool = false,	946	disable_lld_caching: bool = false,
939	cache_mode: CacheMode = .incremental,	947	cache_mode: CacheMode = .incremental,
940	keep_source_files_loaded: bool = false,
941	lib_dirs: []const []const u8 = &[0][]const u8{},	948	lib_dirs: []const []const u8 = &[0][]const u8{},
942	rpath_list: []const []const u8 = &[0][]const u8{},	949	rpath_list: []const []const u8 = &[0][]const u8{},
943	symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .{},	950	symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .{},
...	@@ -1040,7 +1047,6 @@ pub const InitOptions = struct {	...	@@ -1040,7 +1047,6 @@ pub const InitOptions = struct {
1040	test_name_prefix: ?[]const u8 = null,	1047	test_name_prefix: ?[]const u8 = null,
1041	test_runner_path: ?[]const u8 = null,	1048	test_runner_path: ?[]const u8 = null,
1042	subsystem: ?std.Target.SubSystem = null,	1049	subsystem: ?std.Target.SubSystem = null,
1043	debug_format: ?link.File.DebugFormat = null,
1044	/// (Zig compiler development) Enable dumping linker's state as JSON.	1050	/// (Zig compiler development) Enable dumping linker's state as JSON.
1045	enable_link_snapshots: bool = false,	1051	enable_link_snapshots: bool = false,
1046	/// (Darwin) Install name of the dylib	1052	/// (Darwin) Install name of the dylib
...	@@ -1327,7 +1333,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1327,7 +1333,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1327	cache.hash.add(options.config.link_libcpp);	1333	cache.hash.add(options.config.link_libcpp);
1328	cache.hash.add(options.config.link_libunwind);	1334	cache.hash.add(options.config.link_libunwind);
1329	cache.hash.add(output_mode);	1335	cache.hash.add(output_mode);
1330	cache_helpers.addOptionalDebugFormat(&cache.hash, options.debug_format);	1336	cache_helpers.addDebugFormat(&cache.hash, comp.config.debug_format);
1331	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_bin);	1337	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_bin);
1332	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_implib);	1338	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_implib);
1333	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_docs);	1339	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_docs);
...	@@ -1380,7 +1386,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1380,7 +1386,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1380	};	1386	};
1381	errdefer if (opt_zcu) \|zcu\| zcu.deinit();	1387	errdefer if (opt_zcu) \|zcu\| zcu.deinit();
1382		1388
1383	const system_libs = try std.StringArrayHashMapUnmanaged(SystemLib).init(	1389	var system_libs = try std.StringArrayHashMapUnmanaged(SystemLib).init(
1384	gpa,	1390	gpa,
1385	options.system_lib_names,	1391	options.system_lib_names,
1386	options.system_lib_infos,	1392	options.system_lib_infos,
...	@@ -1409,7 +1415,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1409,7 +1415,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1409	.win32_resource_work_queue = if (build_options.only_core_functionality) {} else std.fifo.LinearFifo(*Win32Resource, .Dynamic).init(gpa),	1415	.win32_resource_work_queue = if (build_options.only_core_functionality) {} else std.fifo.LinearFifo(*Win32Resource, .Dynamic).init(gpa),
1410	.astgen_work_queue = std.fifo.LinearFifo(*Module.File, .Dynamic).init(gpa),	1416	.astgen_work_queue = std.fifo.LinearFifo(*Module.File, .Dynamic).init(gpa),
1411	.embed_file_work_queue = std.fifo.LinearFifo(*Module.EmbedFile, .Dynamic).init(gpa),	1417	.embed_file_work_queue = std.fifo.LinearFifo(*Module.EmbedFile, .Dynamic).init(gpa),
1412	.keep_source_files_loaded = options.keep_source_files_loaded,
1413	.c_source_files = options.c_source_files,	1418	.c_source_files = options.c_source_files,
1414	.rc_source_files = options.rc_source_files,	1419	.rc_source_files = options.rc_source_files,
1415	.cache_parent = cache,	1420	.cache_parent = cache,
...	@@ -1451,10 +1456,12 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1451,10 +1456,12 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1451	.llvm_opt_bisect_limit = options.llvm_opt_bisect_limit,	1456	.llvm_opt_bisect_limit = options.llvm_opt_bisect_limit,
1452	.skip_linker_dependencies = options.skip_linker_dependencies,	1457	.skip_linker_dependencies = options.skip_linker_dependencies,
1453	.no_builtin = options.no_builtin,	1458	.no_builtin = options.no_builtin,
		1459	.job_queued_update_builtin_zig = have_zcu,
		1460	.function_sections = options.function_sections,
		1461	.data_sections = options.data_sections,
1454	};	1462	};
1455		1463
1456	const lf_open_opts: link.File.OpenOptions = .{	1464	const lf_open_opts: link.File.OpenOptions = .{
1457	.comp = comp,
1458	.linker_script = options.linker_script,	1465	.linker_script = options.linker_script,
1459	.z_nodelete = options.linker_z_nodelete,	1466	.z_nodelete = options.linker_z_nodelete,
1460	.z_notext = options.linker_z_notext,	1467	.z_notext = options.linker_z_notext,
...	@@ -1471,8 +1478,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1471,8 +1478,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1471	.lib_dirs = options.lib_dirs,	1478	.lib_dirs = options.lib_dirs,
1472	.rpath_list = options.rpath_list,	1479	.rpath_list = options.rpath_list,
1473	.symbol_wrap_set = options.symbol_wrap_set,	1480	.symbol_wrap_set = options.symbol_wrap_set,
1474	.function_sections = options.function_sections,
1475	.data_sections = options.data_sections,
1476	.allow_shlib_undefined = options.linker_allow_shlib_undefined,	1481	.allow_shlib_undefined = options.linker_allow_shlib_undefined,
1477	.bind_global_refs_locally = options.linker_bind_global_refs_locally orelse false,	1482	.bind_global_refs_locally = options.linker_bind_global_refs_locally orelse false,
1478	.compress_debug_sections = options.linker_compress_debug_sections orelse .none,	1483	.compress_debug_sections = options.linker_compress_debug_sections orelse .none,
...	@@ -1507,7 +1512,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1507,7 +1512,6 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1507	.build_id = build_id,	1512	.build_id = build_id,
1508	.disable_lld_caching = options.disable_lld_caching or cache_mode == .whole,	1513	.disable_lld_caching = options.disable_lld_caching or cache_mode == .whole,
1509	.subsystem = options.subsystem,	1514	.subsystem = options.subsystem,
1510	.debug_format = options.debug_format,
1511	.hash_style = options.hash_style,	1515	.hash_style = options.hash_style,
1512	.enable_link_snapshots = options.enable_link_snapshots,	1516	.enable_link_snapshots = options.enable_link_snapshots,
1513	.install_name = options.install_name,	1517	.install_name = options.install_name,
...	@@ -1572,17 +1576,17 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1572,17 +1576,17 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1572	.directory = emit_bin.directory orelse artifact_directory,	1576	.directory = emit_bin.directory orelse artifact_directory,
1573	.sub_path = emit_bin.basename,	1577	.sub_path = emit_bin.basename,
1574	};	1578	};
1575	comp.bin_file = try link.File.open(arena, emit, lf_open_opts);	1579	comp.bin_file = try link.File.open(arena, comp, emit, lf_open_opts);
1576	}	1580	}
1577		1581
1578	if (options.implib_emit) \|emit_implib\| {	1582	if (options.emit_implib) \|emit_implib\| {
1579	comp.implib_emit = .{	1583	comp.implib_emit = .{
1580	.directory = emit_implib.directory orelse artifact_directory,	1584	.directory = emit_implib.directory orelse artifact_directory,
1581	.sub_path = emit_implib.basename,	1585	.sub_path = emit_implib.basename,
1582	};	1586	};
1583	}	1587	}
1584		1588
1585	if (options.docs_emit) \|emit_docs\| {	1589	if (options.emit_docs) \|emit_docs\| {
1586	comp.docs_emit = .{	1590	comp.docs_emit = .{
1587	.directory = emit_docs.directory orelse artifact_directory,	1591	.directory = emit_docs.directory orelse artifact_directory,
1588	.sub_path = emit_docs.basename,	1592	.sub_path = emit_docs.basename,
...	@@ -1610,6 +1614,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1610,6 +1614,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1610	.bin_sub_path = try prepareWholeEmitSubPath(arena, options.emit_bin),	1614	.bin_sub_path = try prepareWholeEmitSubPath(arena, options.emit_bin),
1611	.implib_sub_path = try prepareWholeEmitSubPath(arena, options.emit_implib),	1615	.implib_sub_path = try prepareWholeEmitSubPath(arena, options.emit_implib),
1612	.docs_sub_path = try prepareWholeEmitSubPath(arena, options.emit_docs),	1616	.docs_sub_path = try prepareWholeEmitSubPath(arena, options.emit_docs),
		1617	.tmp_artifact_directory = null,
1613	};	1618	};
1614	comp.cache_use = .{ .whole = whole };	1619	comp.cache_use = .{ .whole = whole };
1615	},	1620	},
...	@@ -1662,7 +1667,10 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1662,7 +1667,10 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1662	}	1667	}
1663	}	1668	}
1664		1669
1665	const have_bin_emit = comp.bin_file != null or comp.whole_bin_sub_path != null;	1670	const have_bin_emit = switch (comp.cache_use) {
		1671	.whole => \|whole\| whole.bin_sub_path != null,
		1672	.incremental => comp.bin_file != null,
		1673	};
1666		1674
1667	if (have_bin_emit and !comp.skip_linker_dependencies and target.ofmt != .c) {	1675	if (have_bin_emit and !comp.skip_linker_dependencies and target.ofmt != .c) {
1668	if (target.isDarwin()) {	1676	if (target.isDarwin()) {
...	@@ -1814,8 +1822,13 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {	...	@@ -1814,8 +1822,13 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1814	pub fn destroy(self: *Compilation) void {	1822	pub fn destroy(self: *Compilation) void {
1815	if (self.bin_file) \|lf\| lf.destroy();	1823	if (self.bin_file) \|lf\| lf.destroy();
1816	if (self.module) \|zcu\| zcu.deinit();	1824	if (self.module) \|zcu\| zcu.deinit();
		1825	switch (self.cache_use) {
		1826	.incremental => \|incremental\| {
		1827	incremental.artifact_directory.handle.close();
		1828	},
		1829	.whole => {},
		1830	}
1817		1831
1818	const gpa = self.gpa;
1819	self.work_queue.deinit();	1832	self.work_queue.deinit();
1820	self.anon_work_queue.deinit();	1833	self.anon_work_queue.deinit();
1821	self.c_object_work_queue.deinit();	1834	self.c_object_work_queue.deinit();
...	@@ -1825,6 +1838,9 @@ pub fn destroy(self: *Compilation) void {	...	@@ -1825,6 +1838,9 @@ pub fn destroy(self: *Compilation) void {
1825	self.astgen_work_queue.deinit();	1838	self.astgen_work_queue.deinit();
1826	self.embed_file_work_queue.deinit();	1839	self.embed_file_work_queue.deinit();
1827		1840
		1841	const gpa = self.gpa;
		1842	self.system_libs.deinit(gpa);
		1843
1828	{	1844	{
1829	var it = self.crt_files.iterator();	1845	var it = self.crt_files.iterator();
1830	while (it.next()) \|entry\| {	1846	while (it.next()) \|entry\| {
...	@@ -1914,7 +1930,7 @@ pub fn hotCodeSwap(comp: Compilation, prog_node: std.Progress.Node, pid: std.C	...	@@ -1914,7 +1930,7 @@ pub fn hotCodeSwap(comp: Compilation, prog_node: std.Progress.Node, pid: std.C
1914	}	1930	}
1915		1931
1916	fn cleanupAfterUpdate(comp: *Compilation) void {	1932	fn cleanupAfterUpdate(comp: *Compilation) void {
1917	switch (comp) {	1933	switch (comp.cache_use) {
1918	.incremental => return,	1934	.incremental => return,
1919	.whole => \|whole\| {	1935	.whole => \|whole\| {
1920	if (whole.cache_manifest) \|man\| {	1936	if (whole.cache_manifest) \|man\| {
...	@@ -1971,7 +1987,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -1971,7 +1987,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
1971	log.debug("CacheMode.whole cache hit for {s}", .{comp.root_name});	1987	log.debug("CacheMode.whole cache hit for {s}", .{comp.root_name});
1972	const digest = man.final();	1988	const digest = man.final();
1973		1989
1974	comp.wholeCacheModeSetBinFilePath(&digest);	1990	comp.wholeCacheModeSetBinFilePath(whole, &digest);
1975		1991
1976	assert(comp.bin_file.lock == null);	1992	assert(comp.bin_file.lock == null);
1977	comp.bin_file.lock = man.toOwnedLock();	1993	comp.bin_file.lock = man.toOwnedLock();
...	@@ -2001,21 +2017,21 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -2001,21 +2017,21 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2001	// Now that the directory is known, it is time to create the Emit	2017	// Now that the directory is known, it is time to create the Emit
2002	// objects and call link.File.open.	2018	// objects and call link.File.open.
2003		2019
2004	if (comp.whole_implib_sub_path) \|sub_path\| {	2020	if (whole.implib_sub_path) \|sub_path\| {
2005	comp.implib_emit = .{	2021	comp.implib_emit = .{
2006	.directory = tmp_artifact_directory,	2022	.directory = tmp_artifact_directory,
2007	.sub_path = std.fs.path.basename(sub_path),	2023	.sub_path = std.fs.path.basename(sub_path),
2008	};	2024	};
2009	}	2025	}
2010		2026
2011	if (comp.whole_docs_sub_path) \|sub_path\| {	2027	if (whole.docs_sub_path) \|sub_path\| {
2012	comp.docs_emit = .{	2028	comp.docs_emit = .{
2013	.directory = tmp_artifact_directory,	2029	.directory = tmp_artifact_directory,
2014	.sub_path = std.fs.path.basename(sub_path),	2030	.sub_path = std.fs.path.basename(sub_path),
2015	};	2031	};
2016	}	2032	}
2017		2033
2018	if (comp.whole_bin_sub_path) \|sub_path\| {	2034	if (whole.bin_sub_path) \|sub_path\| {
2019	const emit: Emit = .{	2035	const emit: Emit = .{
2020	.directory = tmp_artifact_directory,	2036	.directory = tmp_artifact_directory,
2021	.sub_path = std.fs.path.basename(sub_path),	2037	.sub_path = std.fs.path.basename(sub_path),
...	@@ -2024,7 +2040,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -2024,7 +2040,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2024	// but in practice it won't leak much and usually whole cache mode	2040	// but in practice it won't leak much and usually whole cache mode
2025	// will be combined with exactly one call to update().	2041	// will be combined with exactly one call to update().
2026	const arena = comp.arena.allocator();	2042	const arena = comp.arena.allocator();
2027	comp.bin_file = try link.File.open(arena, emit, whole.lf_open_opts);	2043	comp.bin_file = try link.File.createEmpty(arena, comp, emit, whole.lf_open_opts);
2028	}	2044	}
2029	},	2045	},
2030	.incremental => {},	2046	.incremental => {},
...	@@ -2158,7 +2174,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -2158,7 +2174,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2158	const o_sub_path = "o" ++ s ++ digest;	2174	const o_sub_path = "o" ++ s ++ digest;
2159		2175
2160	try renameTmpIntoCache(comp.local_cache_directory, tmp_dir_sub_path, o_sub_path);	2176	try renameTmpIntoCache(comp.local_cache_directory, tmp_dir_sub_path, o_sub_path);
2161	comp.wholeCacheModeSetBinFilePath(&digest);	2177	comp.wholeCacheModeSetBinFilePath(whole, &digest);
2162		2178
2163	// Failure here only means an unnecessary cache miss.	2179	// Failure here only means an unnecessary cache miss.
2164	man.writeManifest() catch \|err\| {	2180	man.writeManifest() catch \|err\| {
...	@@ -2170,19 +2186,6 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void	...	@@ -2170,19 +2186,6 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2170	},	2186	},
2171	.incremental => {},	2187	.incremental => {},
2172	}	2188	}
2173
2174	// Unload all source files to save memory.
2175	// The ZIR needs to stay loaded in memory because (1) Decl objects contain references
2176	// to it, and (2) generic instantiations, comptime calls, inline calls will need
2177	// to reference the ZIR.
2178	if (!comp.keep_source_files_loaded) {
2179	if (comp.module) \|module\| {
2180	for (module.import_table.values()) \|file\| {
2181	file.unloadTree(comp.gpa);
2182	file.unloadSource(comp.gpa);
2183	}
2184	}
2185	}
2186	}	2189	}
2187		2190
2188	/// This function is called by the frontend before flush(). It communicates that	2191	/// This function is called by the frontend before flush(). It communicates that
...	@@ -2274,10 +2277,14 @@ fn flush(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -2274,10 +2277,14 @@ fn flush(comp: Compilation, prog_node: std.Progress.Node) !void {
2274	}	2277	}
2275		2278
2276	/// Communicate the output binary location to parent Compilations.	2279	/// Communicate the output binary location to parent Compilations.
2277	fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_digest_len]u8) void {	2280	fn wholeCacheModeSetBinFilePath(
		2281	comp: *Compilation,
		2282	whole: *CacheUse.Whole,
		2283	digest: *const [Cache.hex_digest_len]u8,
		2284	) void {
2278	const digest_start = 2; // "o/[digest]/[basename]"	2285	const digest_start = 2; // "o/[digest]/[basename]"
2279		2286
2280	if (comp.whole_bin_sub_path) \|sub_path\| {	2287	if (whole.bin_sub_path) \|sub_path\| {
2281	@memcpy(sub_path[digest_start..][0..digest.len], digest);	2288	@memcpy(sub_path[digest_start..][0..digest.len], digest);
2282		2289
2283	comp.bin_file.?.emit = .{	2290	comp.bin_file.?.emit = .{
...	@@ -2286,7 +2293,7 @@ fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_di	...	@@ -2286,7 +2293,7 @@ fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_di
2286	};	2293	};
2287	}	2294	}
2288		2295
2289	if (comp.whole_implib_sub_path) \|sub_path\| {	2296	if (whole.implib_sub_path) \|sub_path\| {
2290	@memcpy(sub_path[digest_start..][0..digest.len], digest);	2297	@memcpy(sub_path[digest_start..][0..digest.len], digest);
2291		2298
2292	comp.implib_emit = .{	2299	comp.implib_emit = .{
...	@@ -2295,7 +2302,7 @@ fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_di	...	@@ -2295,7 +2302,7 @@ fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_di
2295	};	2302	};
2296	}	2303	}
2297		2304
2298	if (comp.whole_docs_sub_path) \|sub_path\| {	2305	if (whole.docs_sub_path) \|sub_path\| {
2299	@memcpy(sub_path[digest_start..][0..digest.len], digest);	2306	@memcpy(sub_path[digest_start..][0..digest.len], digest);
2300		2307
2301	comp.docs_emit = .{	2308	comp.docs_emit = .{
...	@@ -3232,13 +3239,25 @@ pub fn performAllTheWork(	...	@@ -3232,13 +3239,25 @@ pub fn performAllTheWork(
3232	// 1. to avoid race condition of zig processes truncating each other's builtin.zig files	3239	// 1. to avoid race condition of zig processes truncating each other's builtin.zig files
3233	// 2. optimization; in the hot path it only incurs a stat() syscall, which happens	3240	// 2. optimization; in the hot path it only incurs a stat() syscall, which happens
3234	// in the `astgen_wait_group`.	3241	// in the `astgen_wait_group`.
3235	if (comp.module) \|mod\| {	3242	if (comp.job_queued_update_builtin_zig) b: {
3236	if (mod.job_queued_update_builtin_zig) {	3243	comp.job_queued_update_builtin_zig = false;
3237	mod.job_queued_update_builtin_zig = false;	3244	const zcu = comp.module orelse break :b;
		3245	_ = zcu;
		3246	// TODO put all the modules in a flat array to make them easy to iterate.
		3247	var seen: std.AutoArrayHashMapUnmanaged(*Package.Module, void) = .{};
		3248	defer seen.deinit(comp.gpa);
		3249	try seen.put(comp.gpa, comp.root_mod);
		3250	var i: usize = 0;
		3251	while (i < seen.count()) : (i += 1) {
		3252	const mod = seen.keys()[i];
		3253	for (mod.deps.values()) \|dep\|
		3254	try seen.put(comp.gpa, dep);
		3255
		3256	const file = mod.builtin_file orelse continue;
3238		3257
3239	comp.astgen_wait_group.start();	3258	comp.astgen_wait_group.start();
3240	try comp.thread_pool.spawn(workerUpdateBuiltinZigFile, .{	3259	try comp.thread_pool.spawn(workerUpdateBuiltinZigFile, .{
3241	comp, mod, &comp.astgen_wait_group,	3260	comp, mod, file, &comp.astgen_wait_group,
3242	});	3261	});
3243	}	3262	}
3244	}	3263	}
...	@@ -3702,19 +3721,17 @@ fn workerAstGenFile(	...	@@ -3702,19 +3721,17 @@ fn workerAstGenFile(
3702		3721
3703	fn workerUpdateBuiltinZigFile(	3722	fn workerUpdateBuiltinZigFile(
3704	comp: *Compilation,	3723	comp: *Compilation,
3705	mod: *Module,	3724	mod: *Package.Module,
		3725	file: *Module.File,
3706	wg: *WaitGroup,	3726	wg: *WaitGroup,
3707	) void {	3727	) void {
3708	defer wg.finish();	3728	defer wg.finish();
3709		3729	Builtin.populateFile(comp, mod, file) catch \|err\| {
3710	mod.populateBuiltinFile() catch \|err\| {
3711	const dir_path: []const u8 = mod.zig_cache_artifact_directory.path orelse ".";
3712
3713	comp.mutex.lock();	3730	comp.mutex.lock();
3714	defer comp.mutex.unlock();	3731	defer comp.mutex.unlock();
3715		3732
3716	comp.setMiscFailure(.write_builtin_zig, "unable to write builtin.zig to {s}: {s}", .{	3733	comp.setMiscFailure(.write_builtin_zig, "unable to write '{}{s}': {s}", .{
3717	dir_path, @errorName(err),	3734	mod.root, mod.root_src_path, @errorName(err),
3718	});	3735	});
3719	};	3736	};
3720	}	3737	}
...	@@ -3755,14 +3772,17 @@ fn detectEmbedFileUpdate(comp: Compilation, embed_file: Module.EmbedFile) !voi	...	@@ -3755,14 +3772,17 @@ fn detectEmbedFileUpdate(comp: Compilation, embed_file: Module.EmbedFile) !voi
3755	@panic("TODO: handle embed file incremental update");	3772	@panic("TODO: handle embed file incremental update");
3756	}	3773	}
3757		3774
3758	pub fn obtainCObjectCacheManifest(comp: *const Compilation) Cache.Manifest {	3775	pub fn obtainCObjectCacheManifest(
		3776	comp: *const Compilation,
		3777	owner_mod: *Package.Module,
		3778	) Cache.Manifest {
3759	var man = comp.cache_parent.obtain();	3779	var man = comp.cache_parent.obtain();
3760		3780
3761	// Only things that need to be added on top of the base hash, and only things	3781	// Only things that need to be added on top of the base hash, and only things
3762	// that apply both to @cImport and compiling C objects. No linking stuff here!	3782	// that apply both to @cImport and compiling C objects. No linking stuff here!
3763	// Also nothing that applies only to compiling .zig code.	3783	// Also nothing that applies only to compiling .zig code.
3764	man.hash.add(comp.sanitize_c);	3784	man.hash.add(owner_mod.sanitize_c);
3765	man.hash.addListOfBytes(comp.clang_argv);	3785	man.hash.addListOfBytes(owner_mod.clang_argv);
3766	man.hash.add(comp.config.link_libcpp);	3786	man.hash.add(comp.config.link_libcpp);
3767		3787
3768	// When libc_installation is null it means that Zig generated this dir list	3788	// When libc_installation is null it means that Zig generated this dir list
...	@@ -3797,19 +3817,19 @@ pub const CImportResult = struct {	...	@@ -3797,19 +3817,19 @@ pub const CImportResult = struct {
3797	/// Caller owns returned memory.	3817	/// Caller owns returned memory.
3798	/// This API is currently coupled pretty tightly to stage1's needs; it will need to be reworked	3818	/// This API is currently coupled pretty tightly to stage1's needs; it will need to be reworked
3799	/// a bit when we want to start using it from self-hosted.	3819	/// a bit when we want to start using it from self-hosted.
3800	pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult {	3820	pub fn cImport(comp: Compilation, c_src: []const u8, owner_mod: Package.Module) !CImportResult {
3801	if (build_options.only_core_functionality) @panic("@cImport is not available in a zig2.c build");	3821	if (build_options.only_core_functionality) @panic("@cImport is not available in a zig2.c build");
3802	const tracy_trace = trace(@src());	3822	const tracy_trace = trace(@src());
3803	defer tracy_trace.end();	3823	defer tracy_trace.end();
3804		3824
3805	const cimport_zig_basename = "cimport.zig";	3825	const cimport_zig_basename = "cimport.zig";
3806		3826
3807	var man = comp.obtainCObjectCacheManifest();	3827	var man = comp.obtainCObjectCacheManifest(owner_mod);
3808	defer man.deinit();	3828	defer man.deinit();
3809		3829
3810	man.hash.add(@as(u16, 0xb945)); // Random number to distinguish translate-c from compiling C objects	3830	man.hash.add(@as(u16, 0xb945)); // Random number to distinguish translate-c from compiling C objects
3811	man.hash.addBytes(c_src);	3831	man.hash.addBytes(c_src);
3812	man.hash.add(comp.c_frontend);	3832	man.hash.add(comp.config.c_frontend);
3813		3833
3814	// If the previous invocation resulted in clang errors, we will see a hit	3834	// If the previous invocation resulted in clang errors, we will see a hit
3815	// here with 0 files in the manifest, in which case it is actually a miss.	3835	// here with 0 files in the manifest, in which case it is actually a miss.
...	@@ -3846,15 +3866,15 @@ pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult {	...	@@ -3846,15 +3866,15 @@ pub fn cImport(comp: *Compilation, c_src: []const u8) !CImportResult {
3846	var argv = std.ArrayList([]const u8).init(comp.gpa);	3866	var argv = std.ArrayList([]const u8).init(comp.gpa);
3847	defer argv.deinit();	3867	defer argv.deinit();
3848		3868
3849	try argv.append(@tagName(comp.c_frontend)); // argv[0] is program name, actual args start at [1]	3869	try argv.append(@tagName(comp.config.c_frontend)); // argv[0] is program name, actual args start at [1]
3850	try comp.addTranslateCCArgs(arena, &argv, .c, out_dep_path);	3870	try comp.addTranslateCCArgs(arena, &argv, .c, out_dep_path, owner_mod);
3851		3871
3852	try argv.append(out_h_path);	3872	try argv.append(out_h_path);
3853		3873
3854	if (comp.verbose_cc) {	3874	if (comp.verbose_cc) {
3855	dump_argv(argv.items);	3875	dump_argv(argv.items);
3856	}	3876	}
3857	var tree = switch (comp.c_frontend) {	3877	var tree = switch (comp.config.c_frontend) {
3858	.aro => tree: {	3878	.aro => tree: {
3859	const translate_c = @import("aro_translate_c.zig");	3879	const translate_c = @import("aro_translate_c.zig");
3860	_ = translate_c;	3880	_ = translate_c;
...	@@ -4119,7 +4139,7 @@ fn reportRetryableEmbedFileError(	...	@@ -4119,7 +4139,7 @@ fn reportRetryableEmbedFileError(
4119	}	4139	}
4120		4140
4121	fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.Progress.Node) !void {	4141	fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.Progress.Node) !void {
4122	if (comp.c_frontend == .aro) {	4142	if (comp.config.c_frontend == .aro) {
4123	return comp.failCObj(c_object, "aro does not support compiling C objects yet", .{});	4143	return comp.failCObj(c_object, "aro does not support compiling C objects yet", .{});
4124	}	4144	}
4125	if (!build_options.have_llvm) {	4145	if (!build_options.have_llvm) {
...	@@ -4142,7 +4162,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P	...	@@ -4142,7 +4162,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P
4142	_ = comp.failed_c_objects.swapRemove(c_object);	4162	_ = comp.failed_c_objects.swapRemove(c_object);
4143	}	4163	}
4144		4164
4145	var man = comp.obtainCObjectCacheManifest();	4165	var man = comp.obtainCObjectCacheManifest(c_object.src.owner);
4146	defer man.deinit();	4166	defer man.deinit();
4147		4167
4148	man.hash.add(comp.clang_preprocessor_mode);	4168	man.hash.add(comp.clang_preprocessor_mode);
...	@@ -4219,7 +4239,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P	...	@@ -4219,7 +4239,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P
4219	if (std.process.can_execv and direct_o and	4239	if (std.process.can_execv and direct_o and
4220	comp.disable_c_depfile and comp.clang_passthrough_mode)	4240	comp.disable_c_depfile and comp.clang_passthrough_mode)
4221	{	4241	{
4222	try comp.addCCArgs(arena, &argv, ext, null);	4242	try comp.addCCArgs(arena, &argv, ext, null, c_object.src.owner);
4223	try argv.appendSlice(c_object.src.extra_flags);	4243	try argv.appendSlice(c_object.src.extra_flags);
4224	try argv.appendSlice(c_object.src.cache_exempt_flags);	4244	try argv.appendSlice(c_object.src.cache_exempt_flags);
4225		4245
...	@@ -4262,7 +4282,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P	...	@@ -4262,7 +4282,7 @@ fn updateCObject(comp: Compilation, c_object: CObject, c_obj_prog_node: *std.P
4262	null	4282	null
4263	else	4283	else
4264	try std.fmt.allocPrint(arena, "{s}.d", .{out_obj_path});	4284	try std.fmt.allocPrint(arena, "{s}.d", .{out_obj_path});
4265	try comp.addCCArgs(arena, &argv, ext, out_dep_path);	4285	try comp.addCCArgs(arena, &argv, ext, out_dep_path, c_object.src.owner);
4266	try argv.appendSlice(c_object.src.extra_flags);	4286	try argv.appendSlice(c_object.src.extra_flags);
4267	try argv.appendSlice(c_object.src.cache_exempt_flags);	4287	try argv.appendSlice(c_object.src.cache_exempt_flags);
4268		4288
...	@@ -4610,7 +4630,7 @@ fn updateWin32Resource(comp: Compilation, win32_resource: Win32Resource, win32	...	@@ -4610,7 +4630,7 @@ fn updateWin32Resource(comp: Compilation, win32_resource: Win32Resource, win32
4610	// mode. While these defines are not normally present when calling rc.exe directly,	4630	// mode. While these defines are not normally present when calling rc.exe directly,
4611	// them being defined matches the behavior of how MSVC calls rc.exe which is the more	4631	// them being defined matches the behavior of how MSVC calls rc.exe which is the more
4612	// relevant behavior in this case.	4632	// relevant behavior in this case.
4613	try comp.addCCArgs(arena, &argv, .rc, out_dep_path);	4633	try comp.addCCArgs(arena, &argv, .rc, out_dep_path, rc_src.owner);
4614		4634
4615	if (comp.verbose_cc) {	4635	if (comp.verbose_cc) {
4616	dump_argv(argv.items);	4636	dump_argv(argv.items);
...	@@ -4788,11 +4808,12 @@ pub fn addTranslateCCArgs(	...	@@ -4788,11 +4808,12 @@ pub fn addTranslateCCArgs(
4788	argv: *std.ArrayList([]const u8),	4808	argv: *std.ArrayList([]const u8),
4789	ext: FileExt,	4809	ext: FileExt,
4790	out_dep_path: ?[]const u8,	4810	out_dep_path: ?[]const u8,
		4811	owner_mod: *Package.Module,
4791	) !void {	4812	) !void {
4792	try argv.appendSlice(&[_][]const u8{ "-x", "c" });	4813	try argv.appendSlice(&.{ "-x", "c" });
4793	try comp.addCCArgs(arena, argv, ext, out_dep_path);	4814	try comp.addCCArgs(arena, argv, ext, out_dep_path, owner_mod);
4794	// This gives us access to preprocessing entities, presumably at the cost of performance.	4815	// This gives us access to preprocessing entities, presumably at the cost of performance.
4795	try argv.appendSlice(&[_][]const u8{ "-Xclang", "-detailed-preprocessing-record" });	4816	try argv.appendSlice(&.{ "-Xclang", "-detailed-preprocessing-record" });
4796	}	4817	}
4797		4818
4798	/// Add common C compiler args between translate-c and C object compilation.	4819	/// Add common C compiler args between translate-c and C object compilation.
...	@@ -4825,11 +4846,11 @@ pub fn addCCArgs(	...	@@ -4825,11 +4846,11 @@ pub fn addCCArgs(
4825	try argv.append("-fno-caret-diagnostics");	4846	try argv.append("-fno-caret-diagnostics");
4826	}	4847	}
4827		4848
4828	if (comp.bin_file.function_sections) {	4849	if (comp.function_sections) {
4829	try argv.append("-ffunction-sections");	4850	try argv.append("-ffunction-sections");
4830	}	4851	}
4831		4852
4832	if (comp.bin_file.data_sections) {	4853	if (comp.data_sections) {
4833	try argv.append("-fdata-sections");	4854	try argv.append("-fdata-sections");
4834	}	4855	}
4835		4856
...	@@ -5088,7 +5109,7 @@ pub fn addCCArgs(	...	@@ -5088,7 +5109,7 @@ pub fn addCCArgs(
5088	try argv.append("-fPIC");	5109	try argv.append("-fPIC");
5089	}	5110	}
5090		5111
5091	if (comp.unwind_tables) {	5112	if (mod.unwind_tables) {
5092	try argv.append("-funwind-tables");	5113	try argv.append("-funwind-tables");
5093	} else {	5114	} else {
5094	try argv.append("-fno-unwind-tables");	5115	try argv.append("-fno-unwind-tables");
...	@@ -5174,7 +5195,7 @@ pub fn addCCArgs(	...	@@ -5174,7 +5195,7 @@ pub fn addCCArgs(
5174	}	5195	}
5175		5196
5176	try argv.ensureUnusedCapacity(2);	5197	try argv.ensureUnusedCapacity(2);
5177	switch (comp.bin_file.debug_format) {	5198	switch (comp.config.debug_format) {
5178	.strip => {},	5199	.strip => {},
5179	.code_view => {	5200	.code_view => {
5180	// -g is required here because -gcodeview doesn't trigger debug info	5201	// -g is required here because -gcodeview doesn't trigger debug info
...	@@ -5210,7 +5231,7 @@ pub fn addCCArgs(	...	@@ -5210,7 +5231,7 @@ pub fn addCCArgs(
5210	try argv.append("-ffreestanding");	5231	try argv.append("-ffreestanding");
5211	}	5232	}
5212		5233
5213	try argv.appendSlice(comp.clang_argv);	5234	try argv.appendSlice(mod.cc_argv);
5214	}	5235	}
5215		5236
5216	fn failCObj(	5237	fn failCObj(
...	@@ -6094,6 +6115,7 @@ fn buildOutputFromZig(	...	@@ -6094,6 +6115,7 @@ fn buildOutputFromZig(
6094	.have_zcu = true,	6115	.have_zcu = true,
6095	.emit_bin = true,	6116	.emit_bin = true,
6096	.root_optimize_mode = comp.compilerRtOptMode(),	6117	.root_optimize_mode = comp.compilerRtOptMode(),
		6118	.root_strip = comp.compilerRtStrip(),
6097	.link_libc = comp.config.link_libc,	6119	.link_libc = comp.config.link_libc,
6098	.any_unwind_tables = unwind_tables,	6120	.any_unwind_tables = unwind_tables,
6099	});	6121	});
...	@@ -6198,6 +6220,7 @@ pub fn build_crt_file(	...	@@ -6198,6 +6220,7 @@ pub fn build_crt_file(
6198	.have_zcu = false,	6220	.have_zcu = false,
6199	.emit_bin = true,	6221	.emit_bin = true,
6200	.root_optimize_mode = comp.compilerRtOptMode(),	6222	.root_optimize_mode = comp.compilerRtOptMode(),
		6223	.root_strip = comp.compilerRtStrip(),
6201	.link_libc = false,	6224	.link_libc = false,
6202	.lto = switch (output_mode) {	6225	.lto = switch (output_mode) {
6203	.Lib => comp.config.lto,	6226	.Lib => comp.config.lto,

src/Compilation/Config.zig+31

 @@ -33,9 +33,16 @@ shared_memory: bool,
 is_test: bool,
 test_evented_io: bool,
 entry: ?[]const u8,
+debug_format: DebugFormat,
 pub const CFrontend = enum { clang, aro };
+pub const DebugFormat = union(enum) {
+    strip,
+    dwarf: std.dwarf.Format,
+    code_view,
+};
 pub const Options = struct {
     output_mode: std.builtin.OutputMode,
     resolved_target: Module.ResolvedTarget,
 @@ -43,6 +50,7 @@ pub const Options = struct {
     have_zcu: bool,
     emit_bin: bool,
     root_optimize_mode: ?std.builtin.OptimizeMode = null,
+    root_strip: ?bool = null,
     link_mode: ?std.builtin.LinkMode = null,
     ensure_libc_on_non_freestanding: bool = false,
     ensure_libcpp_on_non_freestanding: bool = false,
 @@ -51,6 +59,7 @@ pub const Options = struct {
     any_unwind_tables: bool = false,
     any_dyn_libs: bool = false,
     any_c_source_files: bool = false,
+    any_non_stripped: bool = false,
     emit_llvm_ir: bool = false,
     emit_llvm_bc: bool = false,
     link_libc: ?bool = null,
 @@ -74,6 +83,7 @@ pub const Options = struct {
     export_memory: ?bool = null,
     shared_memory: ?bool = null,
     test_evented_io: bool = false,
+    debug_format: ?Config.DebugFormat = null,
 };
 pub fn resolve(options: Options) !Config {
 @@ -365,6 +375,26 @@ pub fn resolve(options: Options) !Config {
         break :b false;
     };
+    const root_strip = b: {
+        if (options.root_strip) |x| break :b x;
+        if (root_optimize_mode == .ReleaseSmall) break :b true;
+        if (!target_util.hasDebugInfo(target)) break :b true;
+        break :b false;
+    };
+    const debug_format: DebugFormat = b: {
+        if (root_strip and !options.any_non_stripped) break :b .strip;
+        break :b switch (target.ofmt) {
+            .elf, .macho, .wasm => .{ .dwarf = .@"32" },
+            .coff => .code_view,
+            .c => switch (target.os.tag) {
+                .windows, .uefi => .code_view,
+                else => .{ .dwarf = .@"32" },
+            },
+            .spirv, .nvptx, .dxcontainer, .hex, .raw, .plan9 => .strip,
+        };
+    };
     return .{
         .output_mode = options.output_mode,
         .have_zcu = options.have_zcu,
 @@ -388,6 +418,7 @@ pub fn resolve(options: Options) !Config {
         .use_lld = use_lld,
         .entry = entry,
         .wasi_exec_model = wasi_exec_model,
+        .debug_format = debug_format,
     };
 }

src/Module.zig-69

...	@@ -152,8 +152,6 @@ stage1_flags: packed struct {	...	@@ -152,8 +152,6 @@ stage1_flags: packed struct {
152	reserved: u2 = 0,	152	reserved: u2 = 0,
153	} = .{},	153	} = .{},
154		154
155	job_queued_update_builtin_zig: bool = true,
156
157	compile_log_text: ArrayListUnmanaged(u8) = .{},	155	compile_log_text: ArrayListUnmanaged(u8) = .{},
158		156
159	emit_h: ?*GlobalEmitH,	157	emit_h: ?*GlobalEmitH,
...	@@ -2490,7 +2488,6 @@ pub fn deinit(mod: *Module) void {	...	@@ -2490,7 +2488,6 @@ pub fn deinit(mod: *Module) void {
2490		2488
2491	mod.compile_log_text.deinit(gpa);	2489	mod.compile_log_text.deinit(gpa);
2492		2490
2493	mod.zig_cache_artifact_directory.handle.close();
2494	mod.local_zir_cache.handle.close();	2491	mod.local_zir_cache.handle.close();
2495	mod.global_zir_cache.handle.close();	2492	mod.global_zir_cache.handle.close();
2496		2493
...	@@ -3075,72 +3072,6 @@ fn updateZirRefs(mod: Module, file: File, old_zir: Zir) !void {	...	@@ -3075,72 +3072,6 @@ fn updateZirRefs(mod: Module, file: File, old_zir: Zir) !void {
3075	}	3072	}
3076	}	3073	}
3077		3074
3078	pub fn populateBuiltinFile(mod: *Module) !void {
3079	const tracy = trace(@src());
3080	defer tracy.end();
3081
3082	const comp = mod.comp;
3083	const builtin_mod, const file = blk: {
3084	comp.mutex.lock();
3085	defer comp.mutex.unlock();
3086
3087	const builtin_mod = mod.main_mod.deps.get("builtin").?;
3088	const result = try mod.importPkg(builtin_mod);
3089	break :blk .{ builtin_mod, result.file };
3090	};
3091	const gpa = mod.gpa;
3092	file.source = try comp.generateBuiltinZigSource(gpa);
3093	file.source_loaded = true;
3094
3095	if (builtin_mod.root.statFile(builtin_mod.root_src_path)) \|stat\| {
3096	if (stat.size != file.source.len) {
3097	log.warn(
3098	"the cached file '{}{s}' had the wrong size. Expected {d}, found {d}. " ++
3099	"Overwriting with correct file contents now",
3100	.{ builtin_mod.root, builtin_mod.root_src_path, file.source.len, stat.size },
3101	);
3102
3103	try writeBuiltinFile(file, builtin_mod);
3104	} else {
3105	file.stat = .{
3106	.size = stat.size,
3107	.inode = stat.inode,
3108	.mtime = stat.mtime,
3109	};
3110	}
3111	} else \|err\| switch (err) {
3112	error.BadPathName => unreachable, // it's always "builtin.zig"
3113	error.NameTooLong => unreachable, // it's always "builtin.zig"
3114	error.PipeBusy => unreachable, // it's not a pipe
3115	error.WouldBlock => unreachable, // not asking for non-blocking I/O
3116
3117	error.FileNotFound => try writeBuiltinFile(file, builtin_mod),
3118
3119	else => \|e\| return e,
3120	}
3121
3122	file.tree = try Ast.parse(gpa, file.source, .zig);
3123	file.tree_loaded = true;
3124	assert(file.tree.errors.len == 0); // builtin.zig must parse
3125
3126	file.zir = try AstGen.generate(gpa, file.tree);
3127	file.zir_loaded = true;
3128	file.status = .success_zir;
3129	}
3130
3131	fn writeBuiltinFile(file: File, builtin_mod: Package.Module) !void {
3132	var af = try builtin_mod.root.atomicFile(builtin_mod.root_src_path, .{});
3133	defer af.deinit();
3134	try af.file.writeAll(file.source);
3135	try af.finish();
3136
3137	file.stat = .{
3138	.size = file.source.len,
3139	.inode = 0, // dummy value
3140	.mtime = 0, // dummy value
3141	};
3142	}
3143
3144	pub fn mapOldZirToNew(	3075	pub fn mapOldZirToNew(
3145	gpa: Allocator,	3076	gpa: Allocator,
3146	old_zir: Zir,	3077	old_zir: Zir,

src/Package/Module.zig+26-5

 @@ -33,11 +33,16 @@ cc_argv: []const []const u8,
 /// (SPIR-V) whether to generate a structured control flow graph or not
 structured_cfg: bool,
-/// The contents of `@import("builtin")` for this module.
+/// If the module is an `@import("builtin")` module, this is the `File` that
-generated_builtin_source: []const u8,
+/// is preallocated for it. Otherwise this field is null.
+builtin_file: ?*File,
 pub const Deps = std.StringArrayHashMapUnmanaged(*Module);
+pub fn isBuiltin(m: Module) bool {
+    return m.file != null;
+}
 pub const Tree = struct {
     /// Each `Package` exposes a `Module` with build.zig as its root source file.
     build_module_table: std.AutoArrayHashMapUnmanaged(MultiHashHexDigest, *Module),
 @@ -329,6 +334,8 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module {
             .wasi_exec_model = options.global.wasi_exec_model,
         }, arena);
+        const new_file = try arena.create(File);
         const digest = Cache.HashHelper.oneShot(generated_builtin_source);
         const builtin_sub_path = try arena.dupe(u8, "b" ++ std.fs.path.sep_str ++ digest);
         const new = try arena.create(Module);
 @@ -359,12 +366,25 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module {
             .stack_protector = stack_protector,
             .code_model = code_model,
             .red_zone = red_zone,
-            .generated_builtin_source = generated_builtin_source,
             .sanitize_c = sanitize_c,
             .sanitize_thread = sanitize_thread,
             .unwind_tables = unwind_tables,
             .cc_argv = &.{},
             .structured_cfg = structured_cfg,
+            .builtin_file = new_file,
+        };
+        new_file.* = .{
+            .sub_file_path = "builtin.zig",
+            .source = generated_builtin_source,
+            .source_loaded = true,
+            .tree_loaded = false,
+            .zir_loaded = false,
+            .stat = undefined,
+            .tree = undefined,
+            .zir = undefined,
+            .status = .never_loaded,
+            .mod = new,
+            .root_decl = .none,
         };
         break :b new;
     };
 @@ -391,12 +411,12 @@ pub fn create(arena: Allocator, options: CreateOptions) !*Package.Module {
         .stack_protector = stack_protector,
         .code_model = code_model,
         .red_zone = red_zone,
-        .generated_builtin_source = builtin_mod.generated_builtin_source,
         .sanitize_c = sanitize_c,
         .sanitize_thread = sanitize_thread,
         .unwind_tables = unwind_tables,
         .cc_argv = options.cc_argv,
         .structured_cfg = structured_cfg,
+        .builtin_file = null,
     };
     try mod.deps.ensureUnusedCapacity(arena, 1);
 @@ -437,8 +457,8 @@ pub fn createLimited(gpa: Allocator, options: LimitedOptions) Allocator.Error!*P
         .sanitize_thread = undefined,
         .unwind_tables = undefined,
         .cc_argv = undefined,
-        .generated_builtin_source = undefined,
         .structured_cfg = undefined,
+        .builtin_file = null,
     };
     return mod;
 }
 @@ -457,3 +477,4 @@ const Cache = std.Build.Cache;
 const Builtin = @import("../Builtin.zig");
 const assert = std.debug.assert;
 const Compilation = @import("../Compilation.zig");
+const File = @import("../Module.zig").File;

src/Sema.zig+6-1

 @@ -784,6 +784,11 @@ pub const Block = struct {
         }
     }
+    pub fn ownerModule(block: Block) *Package.Module {
+        const zcu = block.sema.mod;
+        return zcu.namespacePtr(block.namespace).file_scope.mod;
+    }
     pub fn startAnonDecl(block: *Block) !WipAnonDecl {
         return WipAnonDecl{
             .block = block,
 @@ -5733,7 +5738,7 @@ fn zirCImport(sema: *Sema, parent_block: *Block, inst: Zir.Inst.Index) CompileEr
     // Ignore the result, all the relevant operations have written to c_import_buf already.
     _ = try sema.analyzeBodyBreak(&child_block, body);
-    var c_import_res = comp.cImport(c_import_buf.items) catch |err|
+    var c_import_res = comp.cImport(c_import_buf.items, parent_block.ownerModule()) catch |err|
         return sema.fail(&child_block, src, "C import failed: {s}", .{@errorName(err)});
     defer c_import_res.deinit(gpa);

src/codegen/llvm.zig+4-12

 @@ -854,9 +854,8 @@ pub const Object = struct {
     /// want to iterate over it while adding entries to it.
     pub const DITypeMap = std.AutoArrayHashMapUnmanaged(InternPool.Index, AnnotatedDITypePtr);
-    pub fn create(arena: Allocator, options: link.File.OpenOptions) !*Object {
+    pub fn create(arena: Allocator, comp: *Compilation) !*Object {
         if (build_options.only_c) unreachable;
-        const comp = options.comp;
         const gpa = comp.gpa;
         const target = comp.root_mod.resolved_target.result;
         const llvm_target_triple = try targetTriple(arena, target);
 @@ -878,14 +877,7 @@ pub const Object = struct {
         var target_data: if (build_options.have_llvm) *llvm.TargetData else void = undefined;
         if (builder.useLibLlvm()) {
             debug_info: {
-                const debug_format = options.debug_format orelse b: {
+                switch (comp.config.debug_format) {
-                    if (strip) break :b .strip;
-                    break :b switch (target.ofmt) {
-                        .coff => .code_view,
-                        else => .{ .dwarf = .@"32" },
-                    };
-                };
-                switch (debug_format) {
                     .strip => break :debug_info,
                     .code_view => builder.llvm.module.?.addModuleCodeViewFlag(),
                     .dwarf => |f| builder.llvm.module.?.addModuleDebugInfoFlag(f == .@"64"),
 @@ -961,8 +953,8 @@ pub const Object = struct {
                 opt_level,
                 reloc_mode,
                 code_model,
-                options.function_sections orelse false,
+                comp.function_sections,
-                options.data_sections orelse false,
+                comp.data_sections,
                 float_abi,
                 if (target_util.llvmMachineAbi(target)) |s| s.ptr else null,
             );

src/libunwind.zig+2-1

...	@@ -28,6 +28,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -28,6 +28,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
28	.have_zcu = false,	28	.have_zcu = false,
29	.emit_bin = true,	29	.emit_bin = true,
30	.root_optimize_mode = comp.compilerRtOptMode(),	30	.root_optimize_mode = comp.compilerRtOptMode(),
		31	.root_strip = comp.compilerRtStrip(),
31	.link_libc = true,	32	.link_libc = true,
32	// Disable LTO to avoid https://github.com/llvm/llvm-project/issues/56825	33	// Disable LTO to avoid https://github.com/llvm/llvm-project/issues/56825
33	.lto = false,	34	.lto = false,
...	@@ -131,7 +132,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {	...	@@ -131,7 +132,7 @@ pub fn buildStaticLib(comp: Compilation, prog_node: std.Progress.Node) !void {
131	.libc_installation = comp.libc_installation,	132	.libc_installation = comp.libc_installation,
132	.emit_bin = emit_bin,	133	.emit_bin = emit_bin,
133	.link_mode = link_mode,	134	.link_mode = link_mode,
134	.function_sections = comp.bin_file.function_sections,	135	.function_sections = comp.function_sections,
135	.c_source_files = &c_source_files,	136	.c_source_files = &c_source_files,
136	.verbose_cc = comp.verbose_cc,	137	.verbose_cc = comp.verbose_cc,
137	.verbose_link = comp.verbose_link,	138	.verbose_link = comp.verbose_link,

src/link.zig+22-19

 @@ -68,9 +68,6 @@ pub const File = struct {
     force_undefined_symbols: std.StringArrayHashMapUnmanaged(void),
     allow_shlib_undefined: bool,
     stack_size: u64,
-    debug_format: DebugFormat,
-    function_sections: bool,
-    data_sections: bool,
     /// Prevents other processes from clobbering files in the output directory
     /// of this linking operation.
 @@ -78,16 +75,7 @@ pub const File = struct {
     child_pid: ?std.ChildProcess.Id = null,
-    pub const DebugFormat = union(enum) {
-        strip,
-        dwarf: std.dwarf.Format,
-        code_view,
-    };
     pub const OpenOptions = struct {
-        comp: *Compilation,
-        emit: Compilation.Emit,
         symbol_count_hint: u64 = 32,
         program_code_size_hint: u64 = 256 * 1024,
 @@ -95,8 +83,6 @@ pub const File = struct {
         entry_addr: ?u64,
         stack_size: ?u64,
         image_base: ?u64,
-        function_sections: bool,
-        data_sections: bool,
         eh_frame_hdr: bool,
         emit_relocs: bool,
         rdynamic: bool,
 @@ -150,8 +136,6 @@ pub const File = struct {
         compatibility_version: ?std.SemanticVersion,
-        debug_format: ?DebugFormat,
         // TODO: remove this. libraries are resolved by the frontend.
         lib_dirs: []const []const u8,
         rpath_list: []const []const u8,
 @@ -190,10 +174,29 @@ pub const File = struct {
     /// rewriting it. A malicious file is detected as incremental link failure
     /// and does not cause Illegal Behavior. This operation is not atomic.
     /// `arena` is used for allocations with the same lifetime as the created File.
-    pub fn open(arena: Allocator, options: OpenOptions) !*File {
+    pub fn open(
-        switch (Tag.fromObjectFormat(options.comp.root_mod.resolved_target.result.ofmt)) {
+        arena: Allocator,
+        comp: *Compilation,
+        emit: Compilation.Emit,
+        options: OpenOptions,
+    ) !*File {
+        switch (Tag.fromObjectFormat(comp.root_mod.resolved_target.result.ofmt)) {
+            inline else => |tag| {
+                const ptr = try tag.Type().open(arena, comp, emit, options);
+                return &ptr.base;
+            },
+        }
+    }
+    pub fn createEmpty(
+        arena: Allocator,
+        comp: *Compilation,
+        emit: Compilation.Emit,
+        options: OpenOptions,
+    ) !*File {
+        switch (Tag.fromObjectFormat(comp.root_mod.resolved_target.result.ofmt)) {
             inline else => |tag| {
-                const ptr = try tag.Type().open(arena, options);
+                const ptr = try tag.Type().createEmpty(arena, comp, emit, options);
                 return &ptr.base;
             },
         }

src/link/C.zig+13-13

 @@ -92,21 +92,24 @@ pub fn addString(this: *C, s: []const u8) Allocator.Error!String {
     };
 }
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*C {
+pub fn open(
-    const target = options.comp.root_mod.resolved_target.result;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*C {
+    const target = comp.root_mod.resolved_target.result;
     assert(target.ofmt == .c);
-    const optimize_mode = options.comp.root_mod.optimize_mode;
+    const optimize_mode = comp.root_mod.optimize_mode;
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
-    const output_mode = options.comp.config.output_mode;
+    const output_mode = comp.config.output_mode;
-    const link_mode = options.comp.config.link_mode;
+    const link_mode = comp.config.link_mode;
     // These are caught by `Compilation.Config.resolve`.
     assert(!use_lld);
     assert(!use_llvm);
-    const emit = options.emit;
     const file = try emit.directory.handle.createFile(emit.sub_path, .{
         // Truncation is done on `flush`.
         .truncate = false,
 @@ -119,7 +122,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*C {
     c_file.* = .{
         .base = .{
             .tag = .c,
-            .comp = options.comp,
+            .comp = comp,
             .emit = emit,
             .gc_sections = options.gc_sections orelse (optimize_mode != .Debug and output_mode != .Obj),
             .stack_size = options.stack_size orelse 16777216,
 @@ -129,9 +132,6 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*C {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
     };

src/link/Coff.zig+24-18

 @@ -234,44 +234,49 @@ const ideal_factor = 3;
 const minimum_text_block_size = 64;
 pub const min_text_capacity = padToIdeal(minimum_text_block_size);
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Coff {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Coff {
     if (build_options.only_c) unreachable;
-    const target = options.comp.root_mod.resolved_target.result;
+    const target = comp.root_mod.resolved_target.result;
     assert(target.ofmt == .coff);
-    const self = try createEmpty(arena, options);
+    const self = try createEmpty(arena, comp, emit, options);
     errdefer self.base.destroy();
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
     if (use_lld and use_llvm) {
         // LLVM emits the object file; LLD links it into the final product.
         return self;
     }
-    const sub_path = if (!use_lld) options.emit.sub_path else p: {
+    const sub_path = if (!use_lld) emit.sub_path else p: {
         // Open a temporary object file, not the final output file because we
         // want to link with LLD.
         const o_file_path = try std.fmt.allocPrint(arena, "{s}{s}", .{
-            options.emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
+            emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
         });
         self.base.intermediary_basename = o_file_path;
         break :p o_file_path;
     };
-    self.base.file = try options.emit.directory.handle.createFile(sub_path, .{
+    self.base.file = try emit.directory.handle.createFile(sub_path, .{
         .truncate = false,
         .read = true,
         .mode = link.File.determineMode(
             use_lld,
-            options.comp.config.output_mode,
+            comp.config.output_mode,
-            options.comp.config.link_mode,
+            comp.config.link_mode,
         ),
     });
     assert(self.llvm_object == null);
-    const gpa = self.base.comp.gpa;
+    const gpa = comp.gpa;
     try self.strtab.buffer.ensureUnusedCapacity(gpa, @sizeOf(u32));
     self.strtab.buffer.appendNTimesAssumeCapacity(0, @sizeOf(u32));
 @@ -362,8 +367,12 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Coff {
     return self;
 }
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Coff {
+pub fn createEmpty(
-    const comp = options.comp;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Coff {
     const target = comp.root_mod.resolved_target.result;
     const optimize_mode = comp.root_mod.optimize_mode;
     const output_mode = comp.config.output_mode;
 @@ -380,7 +389,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Coff {
         .base = .{
             .tag = .coff,
             .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .stack_size = options.stack_size orelse 16777216,
             .gc_sections = options.gc_sections orelse (optimize_mode != .Debug),
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -389,9 +398,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Coff {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .code_view,
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
         .ptr_width = ptr_width,
         .page_size = page_size,
 @@ -423,7 +429,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Coff {
     const use_llvm = comp.config.use_llvm;
     if (use_llvm and comp.config.have_zcu) {
-        self.llvm_object = try LlvmObject.create(arena, options);
+        self.llvm_object = try LlvmObject.create(arena, comp);
     }
     return self;
 }

src/link/Coff/lld.zig+1-1

...	@@ -171,7 +171,7 @@ pub fn linkWithLLD(self: Coff, comp: Compilation, prog_node: *std.Progress.Nod	...	@@ -171,7 +171,7 @@ pub fn linkWithLLD(self: Coff, comp: Compilation, prog_node: *std.Progress.Nod
171		171
172	try argv.append("-ERRORLIMIT:0");	172	try argv.append("-ERRORLIMIT:0");
173	try argv.append("-NOLOGO");	173	try argv.append("-NOLOGO");
174	if (self.base.debug_format != .strip) {	174	if (comp.config.debug_format != .strip) {
175	try argv.append("-DEBUG");	175	try argv.append("-DEBUG");
176		176
177	const out_ext = std.fs.path.extension(full_out_path);	177	const out_ext = std.fs.path.extension(full_out_path);

src/link/Elf.zig+27-21

 @@ -228,18 +228,23 @@ pub const HashStyle = enum { sysv, gnu, both };
 pub const CompressDebugSections = enum { none, zlib, zstd };
 pub const SortSection = enum { name, alignment };
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Elf {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Elf {
     if (build_options.only_c) unreachable;
-    const target = options.comp.root_mod.resolved_target.result;
+    const target = comp.root_mod.resolved_target.result;
     assert(target.ofmt == .elf);
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
-    const opt_zcu = options.comp.module;
+    const opt_zcu = comp.module;
-    const output_mode = options.comp.config.output_mode;
+    const output_mode = comp.config.output_mode;
-    const link_mode = options.comp.config.link_mode;
+    const link_mode = comp.config.link_mode;
-    const self = try createEmpty(arena, options);
+    const self = try createEmpty(arena, comp, emit, options);
     errdefer self.base.destroy();
     if (use_lld and use_llvm) {
 @@ -250,23 +255,23 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Elf {
     const is_obj = output_mode == .Obj;
     const is_obj_or_ar = is_obj or (output_mode == .Lib and link_mode == .Static);
-    const sub_path = if (!use_lld) options.emit.sub_path else p: {
+    const sub_path = if (!use_lld) emit.sub_path else p: {
         // Open a temporary object file, not the final output file because we
         // want to link with LLD.
         const o_file_path = try std.fmt.allocPrint(arena, "{s}{s}", .{
-            options.emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
+            emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
         });
         self.base.intermediary_basename = o_file_path;
         break :p o_file_path;
     };
-    self.base.file = try options.emit.directory.handle.createFile(sub_path, .{
+    self.base.file = try emit.directory.handle.createFile(sub_path, .{
         .truncate = false,
         .read = true,
         .mode = link.File.determineMode(use_lld, output_mode, link_mode),
     });
-    const gpa = options.comp.gpa;
+    const gpa = comp.gpa;
     // Index 0 is always a null symbol.
     try self.symbols.append(gpa, .{});
 @@ -343,8 +348,12 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Elf {
     return self;
 }
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Elf {
+pub fn createEmpty(
-    const comp = options.comp;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Elf {
     const use_llvm = comp.config.use_llvm;
     const optimize_mode = comp.root_mod.optimize_mode;
     const target = comp.root_mod.resolved_target.result;
 @@ -373,7 +382,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Elf {
         .base = .{
             .tag = .elf,
             .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse (optimize_mode != .Debug and output_mode != .Obj),
             .stack_size = options.stack_size orelse 16777216,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse !is_native_os,
 @@ -382,9 +391,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Elf {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
         .ptr_width = ptr_width,
         .page_size = page_size,
 @@ -423,7 +429,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Elf {
         .version_script = options.version_script,
     };
     if (use_llvm and comp.config.have_zcu) {
-        self.llvm_object = try LlvmObject.create(arena, options);
+        self.llvm_object = try LlvmObject.create(arena, comp);
     }
     return self;
 @@ -1753,7 +1759,7 @@ fn dumpArgv(self: *Elf, comp: *Compilation) !void {
             try argv.append("-pie");
         }
-        if (self.base.debug_format == .strip) {
+        if (comp.config.debug_format == .strip) {
             try argv.append("-s");
         }
 @@ -2640,7 +2646,7 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v
             try argv.append("--export-dynamic");
         }
-        if (self.base.debug_format == .strip) {
+        if (comp.config.debug_format == .strip) {
             try argv.append("-s");
         }

src/link/Elf/Object.zig+2-1

 @@ -293,13 +293,14 @@ fn initOutputSection(self: Object, elf_file: *Elf, shdr: ElfShdr) error{OutOfMem
 }
 fn skipShdr(self: *Object, index: u16, elf_file: *Elf) bool {
+    const comp = elf_file.base.comp;
     const shdr = self.shdrs.items[index];
     const name = self.getString(shdr.sh_name);
     const ignore = blk: {
         if (mem.startsWith(u8, name, ".note")) break :blk true;
         if (mem.startsWith(u8, name, ".comment")) break :blk true;
         if (mem.startsWith(u8, name, ".llvm_addrsig")) break :blk true;
-        if (elf_file.base.debug_format == .strip and shdr.sh_flags & elf.SHF_ALLOC == 0 and
+        if (comp.config.debug_format == .strip and shdr.sh_flags & elf.SHF_ALLOC == 0 and
             mem.startsWith(u8, name, ".debug")) break :blk true;
         break :blk false;
     };

src/link/Elf/ZigObject.zig+9-3

 @@ -76,7 +76,8 @@ pub const symbol_mask: u32 = 0x7fffffff;
 pub const SHN_ATOM: u16 = 0x100;
 pub fn init(self: *ZigObject, elf_file: *Elf) !void {
-    const gpa = elf_file.base.comp.gpa;
+    const comp = elf_file.base.comp;
+    const gpa = comp.gpa;
     try self.atoms.append(gpa, 0); // null input section
     try self.relocs.append(gpa, .{}); // null relocs section
 @@ -96,8 +97,13 @@ pub fn init(self: *ZigObject, elf_file: *Elf) !void {
     esym.st_shndx = elf.SHN_ABS;
     symbol_ptr.esym_index = esym_index;
-    if (elf_file.base.debug_format != .strip) {
+    switch (comp.config.debug_format) {
-        self.dwarf = Dwarf.init(&elf_file.base, .dwarf32);
+        .strip => {},
+        .dwarf => |v| {
+            assert(v == .@"32");
+            self.dwarf = Dwarf.init(&elf_file.base, .dwarf32);
+        },
+        .code_view => unreachable,
     }
 }

src/link/MachO.zig+22-17

 @@ -182,18 +182,21 @@ pub const SdkLayout = enum {
     vendored,
 };
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*MachO {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*MachO {
     if (build_options.only_c) unreachable;
-    const comp = options.comp;
     const target = comp.root_mod.resolved_target.result;
     const use_lld = build_options.have_llvm and comp.config.use_lld;
     const use_llvm = comp.config.use_llvm;
     assert(target.ofmt == .macho);
     const gpa = comp.gpa;
-    const emit = options.emit;
     const mode: Mode = mode: {
-        if (use_llvm or comp.module == null or comp.cache_mode == .whole)
+        if (use_llvm or comp.module == null or comp.cache_use == .whole)
             break :mode .zld;
         break :mode .incremental;
     };
 @@ -201,7 +204,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*MachO {
         if (comp.module == null) {
             // No point in opening a file, we would not write anything to it.
             // Initialize with empty.
-            return createEmpty(arena, options);
+            return createEmpty(arena, comp, emit, options);
         }
         // Open a temporary object file, not the final output file because we
         // want to link with LLD.
 @@ -210,7 +213,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*MachO {
         });
     } else emit.sub_path;
-    const self = try createEmpty(arena, options);
+    const self = try createEmpty(arena, comp, emit, options);
     errdefer self.base.destroy();
     if (mode == .zld) {
 @@ -232,7 +235,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*MachO {
     });
     self.base.file = file;
-    if (self.base.debug_format != .strip and comp.module != null) {
+    if (comp.config.debug_format != .strip and comp.module != null) {
         // Create dSYM bundle.
         log.debug("creating {s}.dSYM bundle", .{sub_path});
 @@ -279,8 +282,12 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*MachO {
     return self;
 }
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*MachO {
+pub fn createEmpty(
-    const comp = options.comp;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*MachO {
     const optimize_mode = comp.root_mod.optimize_mode;
     const use_llvm = comp.config.use_llvm;
 @@ -289,7 +296,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*MachO {
         .base = .{
             .tag = .macho,
             .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse (optimize_mode != .Debug),
             .stack_size = options.stack_size orelse 16777216,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -298,11 +305,8 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*MachO {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
-        .mode = if (use_llvm or comp.module == null or comp.cache_mode == .whole)
+        .mode = if (use_llvm or comp.module == null or comp.cache_use == .whole)
             .zld
         else
             .incremental,
 @@ -317,7 +321,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*MachO {
     };
     if (use_llvm and comp.module != null) {
-        self.llvm_object = try LlvmObject.create(arena, options);
+        self.llvm_object = try LlvmObject.create(arena, comp);
     }
     log.debug("selected linker mode '{s}'", .{@tagName(self.mode)});
 @@ -4313,7 +4317,8 @@ fn addLocalToSymtab(self: *MachO, sym_loc: SymbolWithLoc, locals: *std.ArrayList
 }
 fn writeSymtab(self: *MachO) !SymtabCtx {
-    const gpa = self.base.comp.gpa;
+    const comp = self.base.comp;
+    const gpa = comp.gpa;
     var locals = std.ArrayList(macho.nlist_64).init(gpa);
     defer locals.deinit();
 @@ -4368,7 +4373,7 @@ fn writeSymtab(self: *MachO) !SymtabCtx {
     // We generate stabs last in order to ensure that the strtab always has debug info
     // strings trailing
-    if (self.base.debug_format != .strip) {
+    if (comp.config.debug_format != .strip) {
         for (self.objects.items) |object| {
             assert(self.d_sym == null); // TODO
             try self.generateSymbolStabs(object, &locals);

src/link/NvPtx.zig+20-13

 @@ -25,12 +25,17 @@ const LlvmObject = @import("../codegen/llvm.zig").Object;
 base: link.File,
 llvm_object: *LlvmObject,
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*NvPtx {
+pub fn createEmpty(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*NvPtx {
     if (build_options.only_c) unreachable;
-    const target = options.comp.root_mod.resolved_target.result;
+    const target = comp.root_mod.resolved_target.result;
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
     assert(use_llvm); // Caught by Compilation.Config.resolve.
     assert(!use_lld); // Caught by Compilation.Config.resolve.
 @@ -42,13 +47,13 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*NvPtx {
         else => return error.PtxArchNotSupported,
     }
-    const llvm_object = try LlvmObject.create(arena, options);
+    const llvm_object = try LlvmObject.create(arena, comp);
     const nvptx = try arena.create(NvPtx);
     nvptx.* = .{
         .base = .{
             .tag = .nvptx,
-            .comp = options.comp,
+            .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse false,
             .stack_size = options.stack_size orelse 0,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -57,9 +62,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*NvPtx {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
         .llvm_object = llvm_object,
     };
 @@ -67,10 +69,15 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*NvPtx {
     return nvptx;
 }
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*NvPtx {
+pub fn open(
-    const target = options.comp.root_mod.resolved_target.result;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*NvPtx {
+    const target = comp.root_mod.resolved_target.result;
     assert(target.ofmt == .nvptx);
-    return createEmpty(arena, options);
+    return createEmpty(arena, comp, emit, options);
 }
 pub fn deinit(self: *NvPtx) void {

src/link/Plan9.zig+21-15

 @@ -294,8 +294,12 @@ pub fn defaultBaseAddrs(arch: std.Target.Cpu.Arch) Bases {
     };
 }
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Plan9 {
+pub fn createEmpty(
-    const comp = options.comp;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Plan9 {
     const target = comp.root_mod.resolved_target.result;
     const gpa = comp.gpa;
     const optimize_mode = comp.root_mod.optimize_mode;
 @@ -313,7 +317,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Plan9 {
         .base = .{
             .tag = .plan9,
             .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse (optimize_mode != .Debug and output_mode != .Obj),
             .stack_size = options.stack_size orelse 16777216,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -322,9 +326,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Plan9 {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
         .sixtyfour_bit = sixtyfour_bit,
         .bases = undefined,
 @@ -1308,26 +1309,31 @@ pub fn deinit(self: *Plan9) void {
     }
 }
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Plan9 {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Plan9 {
     if (build_options.only_c) unreachable;
-    const target = options.comp.root_mod.resolved_target.result;
+    const target = comp.root_mod.resolved_target.result;
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
     assert(!use_llvm); // Caught by Compilation.Config.resolve.
     assert(!use_lld); // Caught by Compilation.Config.resolve.
     assert(target.ofmt == .plan9);
-    const self = try createEmpty(arena, options);
+    const self = try createEmpty(arena, comp, emit, options);
     errdefer self.base.destroy();
-    const file = try options.emit.directory.handle.createFile(options.emit.sub_path, .{
+    const file = try emit.directory.handle.createFile(emit.sub_path, .{
         .read = true,
         .mode = link.File.determineMode(
             use_lld,
-            options.comp.config.output_mode,
+            comp.config.output_mode,
-            options.comp.config.link_mode,
+            comp.config.link_mode,
         ),
     });
     errdefer file.close();
 @@ -1335,7 +1341,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Plan9 {
     self.bases = defaultBaseAddrs(target.cpu.arch);
-    const gpa = options.comp.gpa;
+    const gpa = comp.gpa;
     try self.syms.appendSlice(gpa, &.{
         // we include the global offset table to make it easier for debugging

src/link/SpirV.zig+21-14

 @@ -49,16 +49,21 @@ object: codegen.Object,
 pub const base_tag: link.File.Tag = .spirv;
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*SpirV {
+pub fn createEmpty(
-    const gpa = options.comp.gpa;
+    arena: Allocator,
-    const target = options.comp.root_mod.resolved_target.result;
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*SpirV {
+    const gpa = comp.gpa;
+    const target = comp.root_mod.resolved_target.result;
     const self = try arena.create(SpirV);
     self.* = .{
         .base = .{
             .tag = .spirv,
-            .comp = options.comp,
+            .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse false,
             .stack_size = options.stack_size orelse 0,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -67,9 +72,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*SpirV {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
         },
         .object = codegen.Object.init(gpa),
     };
 @@ -90,22 +92,27 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*SpirV {
     return self;
 }
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*SpirV {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*SpirV {
     if (build_options.only_c) unreachable;
-    const target = options.comp.root_mod.resolved_target.result;
+    const target = comp.root_mod.resolved_target.result;
-    const use_lld = build_options.have_llvm and options.comp.config.use_lld;
+    const use_lld = build_options.have_llvm and comp.config.use_lld;
-    const use_llvm = options.comp.config.use_llvm;
+    const use_llvm = comp.config.use_llvm;
     assert(!use_llvm); // Caught by Compilation.Config.resolve.
     assert(!use_lld); // Caught by Compilation.Config.resolve.
     assert(target.ofmt == .spirv); // Caught by Compilation.Config.resolve.
-    const spirv = try createEmpty(arena, options);
+    const spirv = try createEmpty(arena, comp, emit, options);
     errdefer spirv.base.destroy();
     // TODO: read the file and keep valid parts instead of truncating
-    const file = try options.emit.directory.handle.createFile(options.emit.sub_path, .{
+    const file = try emit.directory.handle.createFile(emit.sub_path, .{
         .truncate = true,
         .read = true,
     });

src/link/Wasm.zig+24-17

 @@ -373,9 +373,13 @@ pub const StringTable = struct {
     }
 };
-pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
+pub fn open(
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Wasm {
     if (build_options.only_c) unreachable;
-    const comp = options.comp;
     const gpa = comp.gpa;
     const target = comp.root_mod.resolved_target.result;
     assert(target.ofmt == .wasm);
 @@ -385,7 +389,7 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
     const output_mode = comp.config.output_mode;
     const shared_memory = comp.config.shared_memory;
-    const wasm = try createEmpty(arena, options);
+    const wasm = try createEmpty(arena, comp, emit, options);
     errdefer wasm.base.destroy();
     if (use_lld and use_llvm) {
 @@ -393,18 +397,18 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
         return wasm;
     }
-    const sub_path = if (!use_lld) options.emit.sub_path else p: {
+    const sub_path = if (!use_lld) emit.sub_path else p: {
         // Open a temporary object file, not the final output file because we
         // want to link with LLD.
         const o_file_path = try std.fmt.allocPrint(arena, "{s}{s}", .{
-            options.emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
+            emit.sub_path, target.ofmt.fileExt(target.cpu.arch),
         });
         wasm.base.intermediary_basename = o_file_path;
         break :p o_file_path;
     };
     // TODO: read the file and keep valid parts instead of truncating
-    const file = try options.emit.directory.handle.createFile(sub_path, .{
+    const file = try emit.directory.handle.createFile(sub_path, .{
         .truncate = true,
         .read = true,
         .mode = if (fs.has_executable_bit)
 @@ -530,8 +534,12 @@ pub fn open(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
     return wasm;
 }
-pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
+pub fn createEmpty(
-    const comp = options.comp;
+    arena: Allocator,
+    comp: *Compilation,
+    emit: Compilation.Emit,
+    options: link.File.OpenOptions,
+) !*Wasm {
     const use_llvm = comp.config.use_llvm;
     const output_mode = comp.config.output_mode;
 @@ -540,7 +548,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
         .base = .{
             .tag = .wasm,
             .comp = comp,
-            .emit = options.emit,
+            .emit = emit,
             .gc_sections = options.gc_sections orelse (output_mode != .Obj),
             .stack_size = options.stack_size orelse std.wasm.page_size * 16, // 1MB
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
 @@ -549,9 +557,6 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
             .build_id = options.build_id,
             .rpath_list = options.rpath_list,
             .force_undefined_symbols = options.force_undefined_symbols,
-            .debug_format = options.debug_format orelse .{ .dwarf = .@"32" },
-            .function_sections = options.function_sections,
-            .data_sections = options.data_sections,
         },
         .name = undefined,
         .import_table = options.import_table,
 @@ -566,7 +571,7 @@ pub fn createEmpty(arena: Allocator, options: link.File.OpenOptions) !*Wasm {
     };
     if (use_llvm) {
-        wasm.llvm_object = try LlvmObject.create(arena, options);
+        wasm.llvm_object = try LlvmObject.create(arena, comp);
     }
     return wasm;
 }
 @@ -4205,11 +4210,11 @@ fn writeToFile(
         if (data_section_index) |data_index| {
             try wasm.emitDataRelocations(&binary_bytes, data_index, symbol_table);
         }
-    } else if (wasm.base.debug_format != .strip) {
+    } else if (comp.config.debug_format != .strip) {
         try wasm.emitNameSection(&binary_bytes, arena);
     }
-    if (wasm.base.debug_format != .strip) {
+    if (comp.config.debug_format != .strip) {
         // The build id must be computed on the main sections only,
         // so we have to do it now, before the debug sections.
         switch (wasm.base.build_id) {
 @@ -4748,7 +4753,7 @@ fn linkWithLLD(wasm: *Wasm, comp: *Compilation, prog_node: *std.Progress.Node) !
             try argv.append("--no-gc-sections");
         }
-        if (wasm.base.debug_format == .strip) {
+        if (comp.config.debug_format == .strip) {
             try argv.append("-s");
         }
 @@ -5276,7 +5281,9 @@ pub fn storeDeclType(wasm: *Wasm, decl_index: InternPool.DeclIndex, func_type: s
 fn markReferences(wasm: *Wasm) !void {
     const tracy = trace(@src());
     defer tracy.end();
     const do_garbage_collect = wasm.base.gc_sections;
+    const comp = wasm.base.comp;
     for (wasm.resolved_symbols.keys()) |sym_loc| {
         const sym = sym_loc.getSymbol(wasm);
 @@ -5287,7 +5294,7 @@ fn markReferences(wasm: *Wasm) !void {
         // Debug sections may require to be parsed and marked when it contains
         // relocations to alive symbols.
-        if (sym.tag == .section and wasm.base.debug_format != .strip) {
+        if (sym.tag == .section and comp.config.debug_format != .strip) {
             const file = sym_loc.file orelse continue; // Incremental debug info is done independently
             const object = &wasm.objects.items[file];
             const atom_index = try Object.parseSymbolIntoAtom(object, file, sym_loc.index, wasm);

src/main.zig+19-14

 @@ -892,7 +892,6 @@ fn buildOutputType(
     var contains_res_file: bool = false;
     var reference_trace: ?u32 = null;
     var pdb_out_path: ?[]const u8 = null;
-    var debug_format: ?link.File.DebugFormat = null;
     var error_limit: ?Module.ErrorInt = null;
     // These are before resolving sysroot.
     var lib_dir_args: std.ArrayListUnmanaged([]const u8) = .{};
 @@ -1054,6 +1053,8 @@ fn buildOutputType(
                             create_module.opts.any_sanitize_thread = true;
                         if (mod_opts.unwind_tables == true)
                             create_module.opts.any_unwind_tables = true;
+                        if (mod_opts.strip == false)
+                            create_module.opts.any_non_stripped = true;
                         const root_src = try introspect.resolvePath(arena, root_src_orig);
                         try create_module.modules.put(arena, mod_name, .{
 @@ -1480,9 +1481,9 @@ fn buildOutputType(
                     } else if (mem.eql(u8, arg, "-fno-strip")) {
                         mod_opts.strip = false;
                     } else if (mem.eql(u8, arg, "-gdwarf32")) {
-                        debug_format = .{ .dwarf = .@"32" };
+                        create_module.opts.debug_format = .{ .dwarf = .@"32" };
                     } else if (mem.eql(u8, arg, "-gdwarf64")) {
-                        debug_format = .{ .dwarf = .@"64" };
+                        create_module.opts.debug_format = .{ .dwarf = .@"64" };
                     } else if (mem.eql(u8, arg, "-fformatted-panics")) {
                         formatted_panics = true;
                     } else if (mem.eql(u8, arg, "-fno-formatted-panics")) {
 @@ -1989,11 +1990,11 @@ fn buildOutputType(
                     },
                     .gdwarf32 => {
                         mod_opts.strip = false;
-                        debug_format = .{ .dwarf = .@"32" };
+                        create_module.opts.debug_format = .{ .dwarf = .@"32" };
                     },
                     .gdwarf64 => {
                         mod_opts.strip = false;
-                        debug_format = .{ .dwarf = .@"64" };
+                        create_module.opts.debug_format = .{ .dwarf = .@"64" };
                     },
                     .sanitize => {
                         if (mem.eql(u8, it.only_arg, "undefined")) {
 @@ -2532,6 +2533,8 @@ fn buildOutputType(
             create_module.opts.any_sanitize_thread = true;
         if (mod_opts.unwind_tables == true)
             create_module.opts.any_unwind_tables = true;
+        if (mod_opts.strip == false)
+            create_module.opts.any_non_stripped = true;
         const src_path = try introspect.resolvePath(arena, unresolved_src_path);
         try create_module.modules.put(arena, "main", .{
 @@ -3359,7 +3362,6 @@ fn buildOutputType(
         .emit_docs = emit_docs_resolved.data,
         .emit_implib = emit_implib_resolved.data,
         .dll_export_fns = dll_export_fns,
-        .keep_source_files_loaded = false,
         .lib_dirs = lib_dirs.items,
         .rpath_list = rpath_list.items,
         .symbol_wrap_set = symbol_wrap_set,
 @@ -3443,7 +3445,6 @@ fn buildOutputType(
         .test_runner_path = test_runner_path,
         .disable_lld_caching = !output_to_cache,
         .subsystem = subsystem,
-        .debug_format = debug_format,
         .debug_compile_errors = debug_compile_errors,
         .enable_link_snapshots = enable_link_snapshots,
         .install_name = install_name,
 @@ -3484,7 +3485,9 @@ fn buildOutputType(
     defer if (!comp_destroyed) comp.destroy();
     if (show_builtin) {
-        return std.io.getStdOut().writeAll(try comp.generateBuiltinZigSource(arena));
+        const builtin_mod = comp.root_mod.deps.get("builtin").?;
+        const source = builtin_mod.builtin_file.?.source;
+        return std.io.getStdOut().writeAll(source);
     }
     switch (listen) {
         .none => {},
 @@ -3737,6 +3740,7 @@ fn createModule(
         const resolved_target = cli_mod.inherited.resolved_target.?;
         create_module.opts.resolved_target = resolved_target;
         create_module.opts.root_optimize_mode = cli_mod.inherited.optimize_mode;
+        create_module.opts.root_strip = cli_mod.inherited.strip;
         const target = resolved_target.result;
         // First, remove libc, libc++, and compiler_rt libraries from the system libraries list.
 @@ -4366,12 +4370,12 @@ fn cmdTranslateC(comp: *Compilation, arena: Allocator, fancy_output: ?*Compilati
     const translated_zig_basename = try std.fmt.allocPrint(arena, "{s}.zig", .{comp.root_name});
-    var man: Cache.Manifest = comp.obtainCObjectCacheManifest();
+    var man: Cache.Manifest = comp.obtainCObjectCacheManifest(comp.root_mod);
     man.want_shared_lock = false;
     defer man.deinit();
     man.hash.add(@as(u16, 0xb945)); // Random number to distinguish translate-c from compiling C objects
-    man.hash.add(comp.c_frontend);
+    man.hash.add(comp.config.c_frontend);
     Compilation.cache_helpers.hashCSource(&man, c_source_file) catch |err| {
         fatal("unable to process '{s}': {s}", .{ c_source_file.src_path, @errorName(err) });
     };
 @@ -4380,14 +4384,14 @@ fn cmdTranslateC(comp: *Compilation, arena: Allocator, fancy_output: ?*Compilati
     const digest = if (try man.hit()) man.final() else digest: {
         if (fancy_output) |p| p.cache_hit = false;
         var argv = std.ArrayList([]const u8).init(arena);
-        try argv.append(@tagName(comp.c_frontend)); // argv[0] is program name, actual args start at [1]
+        try argv.append(@tagName(comp.config.c_frontend)); // argv[0] is program name, actual args start at [1]
         var zig_cache_tmp_dir = try comp.local_cache_directory.handle.makeOpenPath("tmp", .{});
         defer zig_cache_tmp_dir.close();
         const ext = Compilation.classifyFileExt(c_source_file.src_path);
         const out_dep_path: ?[]const u8 = blk: {
-            if (comp.c_frontend == .aro or comp.disable_c_depfile or !ext.clangSupportsDepFile())
+            if (comp.config.c_frontend == .aro or comp.disable_c_depfile or !ext.clangSupportsDepFile())
                 break :blk null;
             const c_src_basename = fs.path.basename(c_source_file.src_path);
 @@ -4397,14 +4401,15 @@ fn cmdTranslateC(comp: *Compilation, arena: Allocator, fancy_output: ?*Compilati
         };
         // TODO
-        if (comp.c_frontend != .aro) try comp.addTranslateCCArgs(arena, &argv, ext, out_dep_path);
+        if (comp.config.c_frontend != .aro)
+            try comp.addTranslateCCArgs(arena, &argv, ext, out_dep_path, comp.root_mod);
         try argv.append(c_source_file.src_path);
         if (comp.verbose_cc) {
             Compilation.dump_argv(argv.items);
         }
-        var tree = switch (comp.c_frontend) {
+        var tree = switch (comp.config.c_frontend) {
             .aro => tree: {
                 const aro = @import("aro");
                 const translate_c = @import("aro_translate_c.zig");

author	Andrew Kelley <andrew@ziglang.org> 2023-12-14 16:41:20-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-01-01 17:51:19-07:00
log	f54471b54c471bb6f8e51a1383be09d01c24d0c3
tree	63b869ef277027fc0f21e4789b953d9d2e421e68
parent	769dea6e37ffef32f0972a0b958ff2ea38db6854

compiler: miscellaneous branch progress