Commit ded5c759f83a4da355a128dd4d7f5e22cbd3cabe | zig

src/Compilation.zig+47-44

...	...	@@ -2629,22 +2629,24 @@ fn reportMultiModuleErrors(mod: *Module) !void {
2629	2629	for (notes[0..num_notes], file.references.items[0..num_notes], 0..) \|*note, ref, i\| {
2630	2630	errdefer for (notes[0..i]) \|*n\| n.deinit(mod.gpa);
2631	2631	note.* = switch (ref) {
2632		.import => \|loc\| blk: {
2633		break :blk try Module.ErrorMsg.init(
2634		mod.gpa,
2635		loc,
2636		"imported from module {s}",
2637		.{loc.file_scope.mod.fully_qualified_name},
2638		);
2639		},
2640		.root => \|pkg\| blk: {
2641		break :blk try Module.ErrorMsg.init(
2642		mod.gpa,
2643		.{ .file_scope = file, .base_node = 0, .lazy = .entire_file },
2644		"root of module {s}",
2645		.{pkg.fully_qualified_name},
2646		);
2647		},
	2632	.import => \|import\| try Module.ErrorMsg.init(
	2633	mod.gpa,
	2634	.{
	2635	.base_node_inst = try mod.intern_pool.trackZir(mod.gpa, import.file, .main_struct_inst),
	2636	.offset = .{ .token_abs = import.token },
	2637	},
	2638	"imported from module {s}",
	2639	.{import.file.mod.fully_qualified_name},
	2640	),
	2641	.root => \|pkg\| try Module.ErrorMsg.init(
	2642	mod.gpa,
	2643	.{
	2644	.base_node_inst = try mod.intern_pool.trackZir(mod.gpa, file, .main_struct_inst),
	2645	.offset = .entire_file,
	2646	},
	2647	"root of module {s}",
	2648	.{pkg.fully_qualified_name},
	2649	),
2648	2650	};
2649	2651	}
2650	2652	errdefer for (notes[0..num_notes]) \|*n\| n.deinit(mod.gpa);
...	...	@@ -2652,7 +2654,10 @@ fn reportMultiModuleErrors(mod: *Module) !void {
2652	2654	if (omitted > 0) {
2653	2655	notes[num_notes] = try Module.ErrorMsg.init(
2654	2656	mod.gpa,
2655		.{ .file_scope = file, .base_node = 0, .lazy = .entire_file },
	2657	.{
	2658	.base_node_inst = try mod.intern_pool.trackZir(mod.gpa, file, .main_struct_inst),
	2659	.offset = .entire_file,
	2660	},
2656	2661	"{} more references omitted",
2657	2662	.{omitted},
2658	2663	);
...	...	@@ -2661,7 +2666,10 @@ fn reportMultiModuleErrors(mod: *Module) !void {
2661	2666
2662	2667	const err = try Module.ErrorMsg.create(
2663	2668	mod.gpa,
2664		.{ .file_scope = file, .base_node = 0, .lazy = .entire_file },
	2669	.{
	2670	.base_node_inst = try mod.intern_pool.trackZir(mod.gpa, file, .main_struct_inst),
	2671	.offset = .entire_file,
	2672	},
2665	2673	"file exists in multiple modules",
2666	2674	.{},
2667	2675	);
...	...	@@ -3060,7 +3068,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
3060	3068
3061	3069	const values = zcu.compile_log_sources.values();
3062	3070	// First one will be the error; subsequent ones will be notes.
3063		const src_loc = values[0].src().upgrade(zcu);
	3071	const src_loc = values[0].src();
3064	3072	const err_msg: Module.ErrorMsg = .{
3065	3073	.src_loc = src_loc,
3066	3074	.msg = "found compile log statement",
...	...	@@ -3070,7 +3078,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
3070	3078
3071	3079	for (values[1..], err_msg.notes) \|src_info, *note\| {
3072	3080	note.* = .{
3073		.src_loc = src_info.src().upgrade(zcu),
	3081	.src_loc = src_info.src(),
3074	3082	.msg = "also here",
3075	3083	};
3076	3084	}
...	...	@@ -3139,8 +3147,9 @@ pub fn addModuleErrorMsg(
3139	3147	) !void {
3140	3148	const gpa = eb.gpa;
3141	3149	const ip = &mod.intern_pool;
3142		const err_source = module_err_msg.src_loc.file_scope.getSource(gpa) catch \|err\| {
3143		const file_path = try module_err_msg.src_loc.file_scope.fullPath(gpa);
	3150	const err_src_loc = module_err_msg.src_loc.upgrade(mod);
	3151	const err_source = err_src_loc.file_scope.getSource(gpa) catch \|err\| {
	3152	const file_path = try err_src_loc.file_scope.fullPath(gpa);
3144	3153	defer gpa.free(file_path);
3145	3154	try eb.addRootErrorMessage(.{
3146	3155	.msg = try eb.printString("unable to load '{s}': {s}", .{
...	...	@@ -3149,9 +3158,9 @@ pub fn addModuleErrorMsg(
3149	3158	});
3150	3159	return;
3151	3160	};
3152		const err_span = try module_err_msg.src_loc.span(gpa);
	3161	const err_span = try err_src_loc.span(gpa);
3153	3162	const err_loc = std.zig.findLineColumn(err_source.bytes, err_span.main);
3154		const file_path = try module_err_msg.src_loc.file_scope.fullPath(gpa);
	3163	const file_path = try err_src_loc.file_scope.fullPath(gpa);
3155	3164	defer gpa.free(file_path);
3156	3165
3157	3166	var ref_traces: std.ArrayListUnmanaged(ErrorBundle.ReferenceTrace) = .{};
...	...	@@ -3208,7 +3217,7 @@ pub fn addModuleErrorMsg(
3208	3217	.span_end = err_span.end,
3209	3218	.line = @intCast(err_loc.line),
3210	3219	.column = @intCast(err_loc.column),
3211		.source_line = if (module_err_msg.src_loc.lazy == .entire_file)
	3220	.source_line = if (err_src_loc.lazy == .entire_file)
3212	3221	0
3213	3222	else
3214	3223	try eb.addString(err_loc.source_line),
...	...	@@ -3225,10 +3234,11 @@ pub fn addModuleErrorMsg(
3225	3234	defer notes.deinit(gpa);
3226	3235
3227	3236	for (module_err_msg.notes) \|module_note\| {
3228		const source = try module_note.src_loc.file_scope.getSource(gpa);
3229		const span = try module_note.src_loc.span(gpa);
	3237	const note_src_loc = module_note.src_loc.upgrade(mod);
	3238	const source = try note_src_loc.file_scope.getSource(gpa);
	3239	const span = try note_src_loc.span(gpa);
3230	3240	const loc = std.zig.findLineColumn(source.bytes, span.main);
3231		const note_file_path = try module_note.src_loc.file_scope.fullPath(gpa);
	3241	const note_file_path = try note_src_loc.file_scope.fullPath(gpa);
3232	3242	defer gpa.free(note_file_path);
3233	3243
3234	3244	const gop = try notes.getOrPutContext(gpa, .{
...	...	@@ -3522,7 +3532,7 @@ fn processOneJob(comp: *Compilation, job: Job, prog_node: std.Progress.Node) !vo
3522	3532	InternPool.AnalUnit.wrap(.{ .decl = decl_index }),
3523	3533	try Module.ErrorMsg.create(
3524	3534	gpa,
3525		decl.navSrcLoc(module).upgrade(module),
	3535	decl.navSrcLoc(module),
3526	3536	"unable to update line number: {s}",
3527	3537	.{@errorName(err)},
3528	3538	),
...	...	@@ -4023,9 +4033,8 @@ fn workerAstGenFile(
4023	4033	const res = mod.importFile(file, import_path) catch continue;
4024	4034	if (!res.is_pkg) {
4025	4035	res.file.addReference(mod.*, .{ .import = .{
4026		.file_scope = file,
4027		.base_node = 0,
4028		.lazy = .{ .token_abs = item.data.token },
	4036	.file = file,
	4037	.token = item.data.token,
4029	4038	} }) catch continue;
4030	4039	}
4031	4040	break :blk res;
...	...	@@ -4398,20 +4407,14 @@ fn reportRetryableAstGenError(
4398	4407
4399	4408	file.status = .retryable_failure;
4400	4409
4401		const src_loc: Module.SrcLoc = switch (src) {
	4410	const src_loc: Module.LazySrcLoc = switch (src) {
4402	4411	.root => .{
4403		.file_scope = file,
4404		.base_node = 0,
4405		.lazy = .entire_file,
	4412	.base_node_inst = try mod.intern_pool.trackZir(gpa, file, .main_struct_inst),
	4413	.offset = .entire_file,
4406	4414	},
4407		.import => \|info\| blk: {
4408		const importing_file = info.importing_file;
4409
4410		break :blk .{
4411		.file_scope = importing_file,
4412		.base_node = 0,
4413		.lazy = .{ .token_abs = info.import_tok },
4414		};
	4415	.import => \|info\| .{
	4416	.base_node_inst = try mod.intern_pool.trackZir(gpa, info.importing_file, .main_struct_inst),
	4417	.offset = .{ .token_abs = info.import_tok },
4415	4418	},
4416	4419	};
4417	4420

src/Sema.zig+4-6

...	...	@@ -2425,8 +2425,7 @@ pub fn errNote(
2425	2425	comptime format: []const u8,
2426	2426	args: anytype,
2427	2427	) error{OutOfMemory}!void {
2428		const zcu = sema.mod;
2429		return zcu.errNoteNonLazy(src.upgrade(zcu), parent, format, args);
	2428	return sema.mod.errNote(src, parent, format, args);
2430	2429	}
2431	2430
2432	2431	fn addFieldErrNote(
...	...	@@ -2454,7 +2453,7 @@ pub fn errMsg(
2454	2453	args: anytype,
2455	2454	) Allocator.Error!*Module.ErrorMsg {
2456	2455	assert(src.offset != .unneeded);
2457		return Module.ErrorMsg.create(sema.gpa, src.upgrade(sema.mod), format, args);
	2456	return Module.ErrorMsg.create(sema.gpa, src, format, args);
2458	2457	}
2459	2458
2460	2459	pub fn fail(
...	...	@@ -2542,7 +2541,6 @@ fn reparentOwnedErrorMsg(
2542	2541	args: anytype,
2543	2542	) !void {
2544	2543	const mod = sema.mod;
2545		const resolved_src = src.upgrade(mod);
2546	2544	const msg_str = try std.fmt.allocPrint(mod.gpa, format, args);
2547	2545
2548	2546	const orig_notes = msg.notes.len;
...	...	@@ -2553,7 +2551,7 @@ fn reparentOwnedErrorMsg(
2553	2551	.msg = msg.msg,
2554	2552	};
2555	2553
2556		msg.src_loc = resolved_src;
	2554	msg.src_loc = src;
2557	2555	msg.msg = msg_str;
2558	2556	}
2559	2557
...	...	@@ -13883,7 +13881,7 @@ fn zirEmbedFile(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!A
13883	13881	return sema.fail(block, operand_src, "file path name cannot be empty", .{});
13884	13882	}
13885	13883
13886		const val = mod.embedFile(block.getFileScope(mod), name, operand_src.upgrade(mod)) catch \|err\| switch (err) {
	13884	const val = mod.embedFile(block.getFileScope(mod), name, operand_src) catch \|err\| switch (err) {
13887	13885	error.ImportOutsideModulePath => {
13888	13886	return sema.fail(block, operand_src, "embed of file outside package path: '{s}'", .{name});
13889	13887	},

src/Zcu.zig+30-48

...	...	@@ -289,10 +289,6 @@ pub const Export = struct {
289	289	section: InternPool.OptionalNullTerminatedString = .none,
290	290	visibility: std.builtin.SymbolVisibility = .default,
291	291	};
292
293		pub fn getSrcLoc(exp: Export, mod: *Module) SrcLoc {
294		return exp.src.upgrade(mod);
295		}
296	292	};
297	293
298	294	pub const Reference = struct {
...	...	@@ -746,7 +742,10 @@ pub const File = struct {
746	742	/// A single reference to a file.
747	743	pub const Reference = union(enum) {
748	744	/// The file is imported directly (i.e. not as a package) with @import.
749		import: SrcLoc,
	745	import: struct {
	746	file: *File,
	747	token: Ast.TokenIndex,
	748	},
750	749	/// The file is the root of a module.
751	750	root: *Package.Module,
752	751	};
...	...	@@ -900,7 +899,7 @@ pub const File = struct {
900	899	}
901	900
902	901	/// Add a reference to this file during AstGen.
903		pub fn addReference(file: *File, mod: Module, ref: File.Reference) !void {
	902	pub fn addReference(file: *File, zcu: Zcu, ref: File.Reference) !void {
904	903	// Don't add the same module root twice. Note that since we always add module roots at the
905	904	// front of the references array (see below), this loop is actually O(1) on valid code.
906	905	if (ref == .root) {
...	...	@@ -917,17 +916,17 @@ pub const File = struct {
917	916	// to make multi-module errors more helpful (since "root-of" notes are generally more
918	917	// informative than "imported-from" notes). This path is hit very rarely, so the speed
919	918	// of the insert operation doesn't matter too much.
920		.root => try file.references.insert(mod.gpa, 0, ref),
	919	.root => try file.references.insert(zcu.gpa, 0, ref),
921	920
922	921	// Other references we'll just put at the end.
923		else => try file.references.append(mod.gpa, ref),
	922	else => try file.references.append(zcu.gpa, ref),
924	923	}
925	924
926		const pkg = switch (ref) {
927		.import => \|loc\| loc.file_scope.mod,
928		.root => \|pkg\| pkg,
	925	const mod = switch (ref) {
	926	.import => \|import\| import.file.mod,
	927	.root => \|mod\| mod,
929	928	};
930		if (pkg != file.mod) file.multi_pkg = true;
	929	if (mod != file.mod) file.multi_pkg = true;
931	930	}
932	931
933	932	/// Mark this file and every file referenced by it as multi_pkg and report an
...	...	@@ -967,30 +966,25 @@ pub const EmbedFile = struct {
967	966	owner: *Package.Module,
968	967	stat: Cache.File.Stat,
969	968	val: InternPool.Index,
970		src_loc: SrcLoc,
	969	src_loc: LazySrcLoc,
971	970	};
972	971
973	972	/// This struct holds data necessary to construct API-facing `AllErrors.Message`.
974	973	/// Its memory is managed with the general purpose allocator so that they
975	974	/// can be created and destroyed in response to incremental updates.
976	975	pub const ErrorMsg = struct {
977		src_loc: SrcLoc,
	976	src_loc: LazySrcLoc,
978	977	msg: []const u8,
979	978	notes: []ErrorMsg = &.{},
980	979	reference_trace_root: AnalUnit.Optional = .none,
981	980
982		pub const Trace = struct {
983		decl: InternPool.NullTerminatedString,
984		src_loc: SrcLoc,
985		};
986
987	981	pub fn create(
988	982	gpa: Allocator,
989		src_loc: SrcLoc,
	983	src_loc: LazySrcLoc,
990	984	comptime format: []const u8,
991	985	args: anytype,
992	986	) !*ErrorMsg {
993		assert(src_loc.lazy != .unneeded);
	987	assert(src_loc.offset != .unneeded);
994	988	const err_msg = try gpa.create(ErrorMsg);
995	989	errdefer gpa.destroy(err_msg);
996	990	err_msg.* = try ErrorMsg.init(gpa, src_loc, format, args);
...	...	@@ -1006,7 +1000,7 @@ pub const ErrorMsg = struct {
1006	1000
1007	1001	pub fn init(
1008	1002	gpa: Allocator,
1009		src_loc: SrcLoc,
	1003	src_loc: LazySrcLoc,
1010	1004	comptime format: []const u8,
1011	1005	args: anytype,
1012	1006	) !ErrorMsg {
...	...	@@ -1994,15 +1988,12 @@ pub const LazySrcLoc = struct {
1994	1988	entire_file,
1995	1989	/// The source location points to a byte offset within a source file,
1996	1990	/// offset from 0. The source file is determined contextually.
1997		/// Inside a `SrcLoc`, the `file_scope` union field will be active.
1998	1991	byte_abs: u32,
1999	1992	/// The source location points to a token within a source file,
2000	1993	/// offset from 0. The source file is determined contextually.
2001		/// Inside a `SrcLoc`, the `file_scope` union field will be active.
2002	1994	token_abs: u32,
2003	1995	/// The source location points to an AST node within a source file,
2004	1996	/// offset from 0. The source file is determined contextually.
2005		/// Inside a `SrcLoc`, the `file_scope` union field will be active.
2006	1997	node_abs: u32,
2007	1998	/// The source location points to a byte offset within a source file,
2008	1999	/// offset from the byte offset of the base node within the file.
...	...	@@ -2373,8 +2364,7 @@ pub const LazySrcLoc = struct {
2373	2364	}
2374	2365
2375	2366	/// Resolve the file and AST node of `base_node_inst` to get a resolved `SrcLoc`.
2376		/// TODO: it is incorrect to store a `SrcLoc` anywhere due to incremental compilation.
2377		/// Probably the type should be removed entirely and this resolution performed on-the-fly when needed.
	2367	/// The resulting `SrcLoc` should only be used ephemerally, as it is not correct across incremental updates.
2378	2368	pub fn upgrade(lazy: LazySrcLoc, zcu: *Zcu) SrcLoc {
2379	2369	const file, const base_node = resolveBaseNode(lazy.base_node_inst, zcu);
2380	2370	return .{
...	...	@@ -3478,7 +3468,7 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void {
3478	3468	try mod.retryable_failures.append(mod.gpa, AnalUnit.wrap(.{ .decl = decl_index }));
3479	3469	mod.failed_analysis.putAssumeCapacityNoClobber(AnalUnit.wrap(.{ .decl = decl_index }), try ErrorMsg.create(
3480	3470	mod.gpa,
3481		decl.navSrcLoc(mod).upgrade(mod),
	3471	decl.navSrcLoc(mod),
3482	3472	"unable to analyze: {s}",
3483	3473	.{@errorName(e)},
3484	3474	));
...	...	@@ -3655,7 +3645,7 @@ pub fn ensureFuncBodyAnalyzed(zcu: *Zcu, maybe_coerced_func_index: InternPool.In
3655	3645	AnalUnit.wrap(.{ .decl = decl_index }),
3656	3646	try Module.ErrorMsg.create(
3657	3647	gpa,
3658		decl.navSrcLoc(zcu).upgrade(zcu),
	3648	decl.navSrcLoc(zcu),
3659	3649	"invalid liveness: {s}",
3660	3650	.{@errorName(err)},
3661	3651	),
...	...	@@ -3679,7 +3669,7 @@ pub fn ensureFuncBodyAnalyzed(zcu: *Zcu, maybe_coerced_func_index: InternPool.In
3679	3669	try zcu.failed_analysis.ensureUnusedCapacity(gpa, 1);
3680	3670	zcu.failed_analysis.putAssumeCapacityNoClobber(AnalUnit.wrap(.{ .decl = decl_index }), try Module.ErrorMsg.create(
3681	3671	gpa,
3682		decl.navSrcLoc(zcu).upgrade(zcu),
	3672	decl.navSrcLoc(zcu),
3683	3673	"unable to codegen: {s}",
3684	3674	.{@errorName(err)},
3685	3675	));
...	...	@@ -4480,7 +4470,7 @@ pub fn embedFile(
4480	4470	mod: *Module,
4481	4471	cur_file: *File,
4482	4472	import_string: []const u8,
4483		src_loc: SrcLoc,
	4473	src_loc: LazySrcLoc,
4484	4474	) !InternPool.Index {
4485	4475	const gpa = mod.gpa;
4486	4476
...	...	@@ -4555,7 +4545,7 @@ fn newEmbedFile(
4555	4545	sub_file_path: []const u8,
4556	4546	resolved_path: []const u8,
4557	4547	result: **EmbedFile,
4558		src_loc: SrcLoc,
	4548	src_loc: LazySrcLoc,
4559	4549	) !InternPool.Index {
4560	4550	const gpa = mod.gpa;
4561	4551	const ip = &mod.intern_pool;
...	...	@@ -5320,17 +5310,13 @@ pub fn initNewAnonDecl(
5320	5310	new_decl.analysis = .complete;
5321	5311	}
5322	5312
5323		pub fn errNoteNonLazy(
	5313	pub fn errNote(
5324	5314	mod: *Module,
5325		src_loc: SrcLoc,
	5315	src_loc: LazySrcLoc,
5326	5316	parent: *ErrorMsg,
5327	5317	comptime format: []const u8,
5328	5318	args: anytype,
5329	5319	) error{OutOfMemory}!void {
5330		if (src_loc.lazy == .unneeded) {
5331		assert(parent.src_loc.lazy == .unneeded);
5332		return;
5333		}
5334	5320	const msg = try std.fmt.allocPrint(mod.gpa, format, args);
5335	5321	errdefer mod.gpa.free(msg);
5336	5322
...	...	@@ -5458,14 +5444,12 @@ fn processExportsInner(
5458	5444	if (gop.found_existing) {
5459	5445	new_export.status = .failed_retryable;
5460	5446	try zcu.failed_exports.ensureUnusedCapacity(gpa, 1);
5461		const src_loc = new_export.getSrcLoc(zcu);
5462		const msg = try ErrorMsg.create(gpa, src_loc, "exported symbol collision: {}", .{
	5447	const msg = try ErrorMsg.create(gpa, new_export.src, "exported symbol collision: {}", .{
5463	5448	new_export.opts.name.fmt(&zcu.intern_pool),
5464	5449	});
5465	5450	errdefer msg.destroy(gpa);
5466	5451	const other_export = zcu.all_exports.items[gop.value_ptr.*];
5467		const other_src_loc = other_export.getSrcLoc(zcu);
5468		try zcu.errNoteNonLazy(other_src_loc, msg, "other symbol here", .{});
	5452	try zcu.errNote(other_export.src, msg, "other symbol here", .{});
5469	5453	zcu.failed_exports.putAssumeCapacityNoClobber(export_idx, msg);
5470	5454	new_export.status = .failed;
5471	5455	} else {
...	...	@@ -5493,8 +5477,7 @@ fn handleUpdateExports(
5493	5477	const new_export = &zcu.all_exports.items[export_idx];
5494	5478	new_export.status = .failed_retryable;
5495	5479	try zcu.failed_exports.ensureUnusedCapacity(gpa, 1);
5496		const src_loc = new_export.getSrcLoc(zcu);
5497		const msg = try ErrorMsg.create(gpa, src_loc, "unable to export: {s}", .{
	5480	const msg = try ErrorMsg.create(gpa, new_export.src, "unable to export: {s}", .{
5498	5481	@errorName(err),
5499	5482	});
5500	5483	zcu.failed_exports.putAssumeCapacityNoClobber(export_idx, msg);
...	...	@@ -5658,7 +5641,7 @@ pub fn linkerUpdateDecl(zcu: *Zcu, decl_index: Decl.Index) !void {
5658	5641	try zcu.failed_analysis.ensureUnusedCapacity(gpa, 1);
5659	5642	zcu.failed_analysis.putAssumeCapacityNoClobber(AnalUnit.wrap(.{ .decl = decl_index }), try ErrorMsg.create(
5660	5643	gpa,
5661		decl.navSrcLoc(zcu).upgrade(zcu),
	5644	decl.navSrcLoc(zcu),
5662	5645	"unable to codegen: {s}",
5663	5646	.{@errorName(err)},
5664	5647	));
...	...	@@ -5685,9 +5668,8 @@ fn reportRetryableFileError(
5685	5668	const err_msg = try ErrorMsg.create(
5686	5669	mod.gpa,
5687	5670	.{
5688		.file_scope = file,
5689		.base_node = 0,
5690		.lazy = .entire_file,
	5671	.base_node_inst = try mod.intern_pool.trackZir(mod.gpa, file, .main_struct_inst),
	5672	.offset = .entire_file,
5691	5673	},
5692	5674	format,
5693	5675	args,

src/arch/aarch64/CodeGen.zig+2-2

...	...	@@ -59,7 +59,7 @@ args: []MCValue,
59	59	ret_mcv: MCValue,
60	60	fn_type: Type,
61	61	arg_index: u32,
62		src_loc: Module.SrcLoc,
	62	src_loc: Module.LazySrcLoc,
63	63	stack_align: u32,
64	64
65	65	/// MIR Instructions
...	...	@@ -331,7 +331,7 @@ const Self = @This();
331	331
332	332	pub fn generate(
333	333	lf: *link.File,
334		src_loc: Module.SrcLoc,
	334	src_loc: Module.LazySrcLoc,
335	335	func_index: InternPool.Index,
336	336	air: Air,
337	337	liveness: Liveness,

src/arch/aarch64/Emit.zig+1-1

...	...	@@ -22,7 +22,7 @@ bin_file: *link.File,
22	22	debug_output: DebugInfoOutput,
23	23	target: *const std.Target,
24	24	err_msg: ?*ErrorMsg = null,
25		src_loc: Module.SrcLoc,
	25	src_loc: Module.LazySrcLoc,
26	26	code: *std.ArrayList(u8),
27	27
28	28	prev_di_line: u32,

src/arch/arm/CodeGen.zig+2-2

...	...	@@ -59,7 +59,7 @@ args: []MCValue,
59	59	ret_mcv: MCValue,
60	60	fn_type: Type,
61	61	arg_index: u32,
62		src_loc: Module.SrcLoc,
	62	src_loc: Module.LazySrcLoc,
63	63	stack_align: u32,
64	64
65	65	/// MIR Instructions
...	...	@@ -338,7 +338,7 @@ const Self = @This();
338	338
339	339	pub fn generate(
340	340	lf: *link.File,
341		src_loc: Module.SrcLoc,
	341	src_loc: Module.LazySrcLoc,
342	342	func_index: InternPool.Index,
343	343	air: Air,
344	344	liveness: Liveness,

src/arch/arm/Emit.zig+1-1

...	...	@@ -26,7 +26,7 @@ bin_file: *link.File,
26	26	debug_output: DebugInfoOutput,
27	27	target: *const std.Target,
28	28	err_msg: ?*ErrorMsg = null,
29		src_loc: Module.SrcLoc,
	29	src_loc: Module.LazySrcLoc,
30	30	code: *std.ArrayList(u8),
31	31
32	32	prev_di_line: u32,

src/arch/riscv64/CodeGen.zig+2-2

...	...	@@ -59,7 +59,7 @@ args: []MCValue,
59	59	ret_mcv: InstTracking,
60	60	fn_type: Type,
61	61	arg_index: usize,
62		src_loc: Zcu.SrcLoc,
	62	src_loc: Zcu.LazySrcLoc,
63	63
64	64	/// MIR Instructions
65	65	mir_instructions: std.MultiArrayList(Mir.Inst) = .{},
...	...	@@ -696,7 +696,7 @@ const CallView = enum(u1) {
696	696
697	697	pub fn generate(
698	698	bin_file: *link.File,
699		src_loc: Zcu.SrcLoc,
	699	src_loc: Zcu.LazySrcLoc,
700	700	func_index: InternPool.Index,
701	701	air: Air,
702	702	liveness: Liveness,

src/arch/riscv64/Lower.zig+1-1

...	...	@@ -8,7 +8,7 @@ allocator: Allocator,
8	8	mir: Mir,
9	9	cc: std.builtin.CallingConvention,
10	10	err_msg: ?*ErrorMsg = null,
11		src_loc: Zcu.SrcLoc,
	11	src_loc: Zcu.LazySrcLoc,
12	12	result_insts_len: u8 = undefined,
13	13	result_relocs_len: u8 = undefined,
14	14	result_insts: [

src/arch/sparc64/CodeGen.zig+2-2

...	...	@@ -64,7 +64,7 @@ args: []MCValue,
64	64	ret_mcv: MCValue,
65	65	fn_type: Type,
66	66	arg_index: usize,
67		src_loc: Module.SrcLoc,
	67	src_loc: Module.LazySrcLoc,
68	68	stack_align: Alignment,
69	69
70	70	/// MIR Instructions
...	...	@@ -263,7 +263,7 @@ const BigTomb = struct {
263	263
264	264	pub fn generate(
265	265	lf: *link.File,
266		src_loc: Module.SrcLoc,
	266	src_loc: Module.LazySrcLoc,
267	267	func_index: InternPool.Index,
268	268	air: Air,
269	269	liveness: Liveness,

src/arch/sparc64/Emit.zig+1-1

...	...	@@ -24,7 +24,7 @@ bin_file: *link.File,
24	24	debug_output: DebugInfoOutput,
25	25	target: *const std.Target,
26	26	err_msg: ?*ErrorMsg = null,
27		src_loc: Module.SrcLoc,
	27	src_loc: Module.LazySrcLoc,
28	28	code: *std.ArrayList(u8),
29	29
30	30	prev_di_line: u32,

src/arch/wasm/CodeGen.zig+3-3

...	...	@@ -765,7 +765,7 @@ pub fn deinit(func: *CodeGen) void {
765	765	/// Sets `err_msg` on `CodeGen` and returns `error.CodegenFail` which is caught in link/Wasm.zig
766	766	fn fail(func: *CodeGen, comptime fmt: []const u8, args: anytype) InnerError {
767	767	const mod = func.bin_file.base.comp.module.?;
768		const src_loc = func.decl.navSrcLoc(mod).upgrade(mod);
	768	const src_loc = func.decl.navSrcLoc(mod);
769	769	func.err_msg = try Zcu.ErrorMsg.create(func.gpa, src_loc, fmt, args);
770	770	return error.CodegenFail;
771	771	}
...	...	@@ -1202,7 +1202,7 @@ fn genFunctype(
1202	1202
1203	1203	pub fn generate(
1204	1204	bin_file: *link.File,
1205		src_loc: Zcu.SrcLoc,
	1205	src_loc: Zcu.LazySrcLoc,
1206	1206	func_index: InternPool.Index,
1207	1207	air: Air,
1208	1208	liveness: Liveness,
...	...	@@ -3162,7 +3162,7 @@ fn lowerAnonDeclRef(
3162	3162	}
3163	3163
3164	3164	const decl_align = mod.intern_pool.indexToKey(anon_decl.orig_ty).ptr_type.flags.alignment;
3165		const res = try func.bin_file.lowerAnonDecl(decl_val, decl_align, func.decl.navSrcLoc(mod).upgrade(mod));
	3165	const res = try func.bin_file.lowerAnonDecl(decl_val, decl_align, func.decl.navSrcLoc(mod));
3166	3166	switch (res) {
3167	3167	.ok => {},
3168	3168	.fail => \|em\| {

src/arch/wasm/Emit.zig+1-1

...	...	@@ -257,7 +257,7 @@ fn fail(emit: *Emit, comptime format: []const u8, args: anytype) InnerError {
257	257	const comp = emit.bin_file.base.comp;
258	258	const zcu = comp.module.?;
259	259	const gpa = comp.gpa;
260		emit.error_msg = try Zcu.ErrorMsg.create(gpa, zcu.declPtr(emit.decl_index).navSrcLoc(zcu).upgrade(zcu), format, args);
	260	emit.error_msg = try Zcu.ErrorMsg.create(gpa, zcu.declPtr(emit.decl_index).navSrcLoc(zcu), format, args);
261	261	return error.EmitFail;
262	262	}
263	263

src/arch/x86_64/CodeGen.zig+3-3

...	...	@@ -74,7 +74,7 @@ va_info: union {
74	74	ret_mcv: InstTracking,
75	75	fn_type: Type,
76	76	arg_index: u32,
77		src_loc: Module.SrcLoc,
	77	src_loc: Module.LazySrcLoc,
78	78
79	79	eflags_inst: ?Air.Inst.Index = null,
80	80
...	...	@@ -795,7 +795,7 @@ const Self = @This();
795	795
796	796	pub fn generate(
797	797	bin_file: *link.File,
798		src_loc: Module.SrcLoc,
	798	src_loc: Module.LazySrcLoc,
799	799	func_index: InternPool.Index,
800	800	air: Air,
801	801	liveness: Liveness,
...	...	@@ -971,7 +971,7 @@ pub fn generate(
971	971
972	972	pub fn generateLazy(
973	973	bin_file: *link.File,
974		src_loc: Module.SrcLoc,
	974	src_loc: Module.LazySrcLoc,
975	975	lazy_sym: link.File.LazySymbol,
976	976	code: *std.ArrayList(u8),
977	977	debug_output: DebugInfoOutput,

src/arch/x86_64/Lower.zig+1-1

...	...	@@ -8,7 +8,7 @@ allocator: Allocator,
8	8	mir: Mir,
9	9	cc: std.builtin.CallingConvention,
10	10	err_msg: ?*ErrorMsg = null,
11		src_loc: Module.SrcLoc,
	11	src_loc: Module.LazySrcLoc,
12	12	result_insts_len: u8 = undefined,
13	13	result_relocs_len: u8 = undefined,
14	14	result_insts: [

src/codegen.zig+11-11

...	...	@@ -47,7 +47,7 @@ pub const DebugInfoOutput = union(enum) {
47	47
48	48	pub fn generateFunction(
49	49	lf: *link.File,
50		src_loc: Module.SrcLoc,
	50	src_loc: Module.LazySrcLoc,
51	51	func_index: InternPool.Index,
52	52	air: Air,
53	53	liveness: Liveness,
...	...	@@ -79,7 +79,7 @@ pub fn generateFunction(
79	79
80	80	pub fn generateLazyFunction(
81	81	lf: *link.File,
82		src_loc: Module.SrcLoc,
	82	src_loc: Module.LazySrcLoc,
83	83	lazy_sym: link.File.LazySymbol,
84	84	code: *std.ArrayList(u8),
85	85	debug_output: DebugInfoOutput,
...	...	@@ -105,7 +105,7 @@ fn writeFloat(comptime F: type, f: F, target: Target, endian: std.builtin.Endian
105	105
106	106	pub fn generateLazySymbol(
107	107	bin_file: *link.File,
108		src_loc: Module.SrcLoc,
	108	src_loc: Module.LazySrcLoc,
109	109	lazy_sym: link.File.LazySymbol,
110	110	// TODO don't use an "out" parameter like this; put it in the result instead
111	111	alignment: *Alignment,
...	...	@@ -171,7 +171,7 @@ pub fn generateLazySymbol(
171	171
172	172	pub fn generateSymbol(
173	173	bin_file: *link.File,
174		src_loc: Module.SrcLoc,
	174	src_loc: Module.LazySrcLoc,
175	175	val: Value,
176	176	code: *std.ArrayList(u8),
177	177	debug_output: DebugInfoOutput,
...	...	@@ -618,7 +618,7 @@ pub fn generateSymbol(
618	618
619	619	fn lowerPtr(
620	620	bin_file: *link.File,
621		src_loc: Module.SrcLoc,
	621	src_loc: Module.LazySrcLoc,
622	622	ptr_val: InternPool.Index,
623	623	code: *std.ArrayList(u8),
624	624	debug_output: DebugInfoOutput,
...	...	@@ -683,7 +683,7 @@ const RelocInfo = struct {
683	683
684	684	fn lowerAnonDeclRef(
685	685	lf: *link.File,
686		src_loc: Module.SrcLoc,
	686	src_loc: Module.LazySrcLoc,
687	687	anon_decl: InternPool.Key.Ptr.BaseAddr.AnonDecl,
688	688	code: *std.ArrayList(u8),
689	689	debug_output: DebugInfoOutput,
...	...	@@ -730,7 +730,7 @@ fn lowerAnonDeclRef(
730	730
731	731	fn lowerDeclRef(
732	732	lf: *link.File,
733		src_loc: Module.SrcLoc,
	733	src_loc: Module.LazySrcLoc,
734	734	decl_index: InternPool.DeclIndex,
735	735	code: *std.ArrayList(u8),
736	736	debug_output: DebugInfoOutput,
...	...	@@ -814,7 +814,7 @@ pub const GenResult = union(enum) {
814	814
815	815	fn fail(
816	816	gpa: Allocator,
817		src_loc: Module.SrcLoc,
	817	src_loc: Module.LazySrcLoc,
818	818	comptime format: []const u8,
819	819	args: anytype,
820	820	) Allocator.Error!GenResult {
...	...	@@ -825,7 +825,7 @@ pub const GenResult = union(enum) {
825	825
826	826	fn genDeclRef(
827	827	lf: *link.File,
828		src_loc: Module.SrcLoc,
	828	src_loc: Module.LazySrcLoc,
829	829	val: Value,
830	830	ptr_decl_index: InternPool.DeclIndex,
831	831	) CodeGenError!GenResult {
...	...	@@ -931,7 +931,7 @@ fn genDeclRef(
931	931
932	932	fn genUnnamedConst(
933	933	lf: *link.File,
934		src_loc: Module.SrcLoc,
	934	src_loc: Module.LazySrcLoc,
935	935	val: Value,
936	936	owner_decl_index: InternPool.DeclIndex,
937	937	) CodeGenError!GenResult {
...	...	@@ -970,7 +970,7 @@ fn genUnnamedConst(
970	970
971	971	pub fn genTypedValue(
972	972	lf: *link.File,
973		src_loc: Module.SrcLoc,
	973	src_loc: Module.LazySrcLoc,
974	974	val: Value,
975	975	owner_decl_index: InternPool.DeclIndex,
976	976	) CodeGenError!GenResult {

src/codegen/c.zig+1-1

...	...	@@ -637,7 +637,7 @@ pub const DeclGen = struct {
637	637	const zcu = dg.zcu;
638	638	const decl_index = dg.pass.decl;
639	639	const decl = zcu.declPtr(decl_index);
640		const src_loc = decl.navSrcLoc(zcu).upgrade(zcu);
	640	const src_loc = decl.navSrcLoc(zcu);
641	641	dg.error_msg = try Zcu.ErrorMsg.create(dg.gpa, src_loc, format, args);
642	642	return error.AnalysisFail;
643	643	}

src/codegen/llvm.zig+1-1

...	...	@@ -4644,7 +4644,7 @@ pub const DeclGen = struct {
4644	4644	const o = dg.object;
4645	4645	const gpa = o.gpa;
4646	4646	const mod = o.module;
4647		const src_loc = dg.decl.navSrcLoc(mod).upgrade(mod);
	4647	const src_loc = dg.decl.navSrcLoc(mod);
4648	4648	dg.err_msg = try Module.ErrorMsg.create(gpa, src_loc, "TODO (LLVM): " ++ format, args);
4649	4649	return error.CodegenFail;
4650	4650	}

src/codegen/spirv.zig+2-2

...	...	@@ -415,7 +415,7 @@ const DeclGen = struct {
415	415	pub fn fail(self: *DeclGen, comptime format: []const u8, args: anytype) Error {
416	416	@setCold(true);
417	417	const mod = self.module;
418		const src_loc = self.module.declPtr(self.decl_index).navSrcLoc(mod).upgrade(mod);
	418	const src_loc = self.module.declPtr(self.decl_index).navSrcLoc(mod);
419	419	assert(self.error_msg == null);
420	420	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, format, args);
421	421	return error.CodegenFail;
...	...	@@ -6439,7 +6439,7 @@ const DeclGen = struct {
6439	6439	// TODO: Translate proper error locations.
6440	6440	assert(as.errors.items.len != 0);
6441	6441	assert(self.error_msg == null);
6442		const src_loc = self.module.declPtr(self.decl_index).navSrcLoc(mod).upgrade(mod);
	6442	const src_loc = self.module.declPtr(self.decl_index).navSrcLoc(mod);
6443	6443	self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, "failed to assemble SPIR-V inline assembly", .{});
6444	6444	const notes = try self.module.gpa.alloc(Module.ErrorMsg, as.errors.items.len);
6445	6445

src/link.zig+1-1

...	...	@@ -646,7 +646,7 @@ pub const File = struct {
646	646	base: *File,
647	647	decl_val: InternPool.Index,
648	648	decl_align: InternPool.Alignment,
649		src_loc: Module.SrcLoc,
	649	src_loc: Module.LazySrcLoc,
650	650	) !LowerResult {
651	651	if (build_options.only_c) @compileError("unreachable");
652	652	switch (base.tag) {

src/link/Coff.zig+9-16

...	...	@@ -1144,7 +1144,7 @@ pub fn updateFunc(self: Coff, mod: Module, func_index: InternPool.Index, air:
1144	1144
1145	1145	const res = try codegen.generateFunction(
1146	1146	&self.base,
1147		decl.navSrcLoc(mod).upgrade(mod),
	1147	decl.navSrcLoc(mod),
1148	1148	func_index,
1149	1149	air,
1150	1150	liveness,
...	...	@@ -1179,7 +1179,7 @@ pub fn lowerUnnamedConst(self: *Coff, val: Value, decl_index: InternPool.DeclInd
1179	1179	const sym_name = try std.fmt.allocPrint(gpa, "__unnamed_{}_{d}", .{ decl_name.fmt(&mod.intern_pool), index });
1180	1180	defer gpa.free(sym_name);
1181	1181	const ty = val.typeOf(mod);
1182		const atom_index = switch (try self.lowerConst(sym_name, val, ty.abiAlignment(mod), self.rdata_section_index.?, decl.navSrcLoc(mod).upgrade(mod))) {
	1182	const atom_index = switch (try self.lowerConst(sym_name, val, ty.abiAlignment(mod), self.rdata_section_index.?, decl.navSrcLoc(mod))) {
1183	1183	.ok => \|atom_index\| atom_index,
1184	1184	.fail => \|em\| {
1185	1185	decl.analysis = .codegen_failure;
...	...	@@ -1197,7 +1197,7 @@ const LowerConstResult = union(enum) {
1197	1197	fail: *Module.ErrorMsg,
1198	1198	};
1199	1199
1200		fn lowerConst(self: *Coff, name: []const u8, val: Value, required_alignment: InternPool.Alignment, sect_id: u16, src_loc: Module.SrcLoc) !LowerConstResult {
	1200	fn lowerConst(self: *Coff, name: []const u8, val: Value, required_alignment: InternPool.Alignment, sect_id: u16, src_loc: Module.LazySrcLoc) !LowerConstResult {
1201	1201	const gpa = self.base.comp.gpa;
1202	1202
1203	1203	var code_buffer = std.ArrayList(u8).init(gpa);
...	...	@@ -1270,7 +1270,7 @@ pub fn updateDecl(
1270	1270	defer code_buffer.deinit();
1271	1271
1272	1272	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
1273		const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod).upgrade(mod), decl_val, &code_buffer, .none, .{
	1273	const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod), decl_val, &code_buffer, .none, .{
1274	1274	.parent_atom_index = atom.getSymbolIndex().?,
1275	1275	});
1276	1276	const code = switch (res) {
...	...	@@ -1309,14 +1309,7 @@ fn updateLazySymbolAtom(
1309	1309	const atom = self.getAtomPtr(atom_index);
1310	1310	const local_sym_index = atom.getSymbolIndex().?;
1311	1311
1312		const src = if (sym.ty.srcLocOrNull(mod)) \|src\|
1313		src.upgrade(mod)
1314		else
1315		Module.SrcLoc{
1316		.file_scope = undefined,
1317		.base_node = undefined,
1318		.lazy = .unneeded,
1319		};
	1312	const src = sym.ty.srcLocOrNull(mod) orelse Module.LazySrcLoc.unneeded;
1320	1313	const res = try codegen.generateLazySymbol(
1321	1314	&self.base,
1322	1315	src,
...	...	@@ -1560,7 +1553,7 @@ pub fn updateExports(
1560	1553	},
1561	1554	.value => \|value\| self.anon_decls.getPtr(value) orelse blk: {
1562	1555	const first_exp = mod.all_exports.items[export_indices[0]];
1563		const res = try self.lowerAnonDecl(value, .none, first_exp.getSrcLoc(mod));
	1556	const res = try self.lowerAnonDecl(value, .none, first_exp.src);
1564	1557	switch (res) {
1565	1558	.ok => {},
1566	1559	.fail => \|em\| {
...	...	@@ -1585,7 +1578,7 @@ pub fn updateExports(
1585	1578	if (!mem.eql(u8, section_name, ".text")) {
1586	1579	try mod.failed_exports.putNoClobber(gpa, export_idx, try Module.ErrorMsg.create(
1587	1580	gpa,
1588		exp.getSrcLoc(mod),
	1581	exp.src,
1589	1582	"Unimplemented: ExportOptions.section",
1590	1583	.{},
1591	1584	));
...	...	@@ -1596,7 +1589,7 @@ pub fn updateExports(
1596	1589	if (exp.opts.linkage == .link_once) {
1597	1590	try mod.failed_exports.putNoClobber(gpa, export_idx, try Module.ErrorMsg.create(
1598	1591	gpa,
1599		exp.getSrcLoc(mod),
	1592	exp.src,
1600	1593	"Unimplemented: GlobalLinkage.link_once",
1601	1594	.{},
1602	1595	));
...	...	@@ -1867,7 +1860,7 @@ pub fn lowerAnonDecl(
1867	1860	self: *Coff,
1868	1861	decl_val: InternPool.Index,
1869	1862	explicit_alignment: InternPool.Alignment,
1870		src_loc: Module.SrcLoc,
	1863	src_loc: Module.LazySrcLoc,
1871	1864	) !codegen.Result {
1872	1865	const gpa = self.base.comp.gpa;
1873	1866	const mod = self.base.comp.module.?;

src/link/Elf.zig+1-1

...	...	@@ -552,7 +552,7 @@ pub fn lowerAnonDecl(
552	552	self: *Elf,
553	553	decl_val: InternPool.Index,
554	554	explicit_alignment: InternPool.Alignment,
555		src_loc: Module.SrcLoc,
	555	src_loc: Module.LazySrcLoc,
556	556	) !codegen.Result {
557	557	return self.zigObjectPtr().?.lowerAnonDecl(self, decl_val, explicit_alignment, src_loc);
558	558	}

src/link/Elf/ZigObject.zig+11-18

...	...	@@ -686,7 +686,7 @@ pub fn lowerAnonDecl(
686	686	elf_file: *Elf,
687	687	decl_val: InternPool.Index,
688	688	explicit_alignment: InternPool.Alignment,
689		src_loc: Module.SrcLoc,
	689	src_loc: Module.LazySrcLoc,
690	690	) !codegen.Result {
691	691	const gpa = elf_file.base.comp.gpa;
692	692	const mod = elf_file.base.comp.module.?;
...	...	@@ -1074,7 +1074,7 @@ pub fn updateFunc(
1074	1074	const res = if (decl_state) \|*ds\|
1075	1075	try codegen.generateFunction(
1076	1076	&elf_file.base,
1077		decl.navSrcLoc(mod).upgrade(mod),
	1077	decl.navSrcLoc(mod),
1078	1078	func_index,
1079	1079	air,
1080	1080	liveness,
...	...	@@ -1084,7 +1084,7 @@ pub fn updateFunc(
1084	1084	else
1085	1085	try codegen.generateFunction(
1086	1086	&elf_file.base,
1087		decl.navSrcLoc(mod).upgrade(mod),
	1087	decl.navSrcLoc(mod),
1088	1088	func_index,
1089	1089	air,
1090	1090	liveness,
...	...	@@ -1156,13 +1156,13 @@ pub fn updateDecl(
1156	1156	// TODO implement .debug_info for global variables
1157	1157	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
1158	1158	const res = if (decl_state) \|*ds\|
1159		try codegen.generateSymbol(&elf_file.base, decl.navSrcLoc(mod).upgrade(mod), decl_val, &code_buffer, .{
	1159	try codegen.generateSymbol(&elf_file.base, decl.navSrcLoc(mod), decl_val, &code_buffer, .{
1160	1160	.dwarf = ds,
1161	1161	}, .{
1162	1162	.parent_atom_index = sym_index,
1163	1163	})
1164	1164	else
1165		try codegen.generateSymbol(&elf_file.base, decl.navSrcLoc(mod).upgrade(mod), decl_val, &code_buffer, .none, .{
	1165	try codegen.generateSymbol(&elf_file.base, decl.navSrcLoc(mod), decl_val, &code_buffer, .none, .{
1166	1166	.parent_atom_index = sym_index,
1167	1167	});
1168	1168
...	...	@@ -1217,14 +1217,7 @@ fn updateLazySymbol(
1217	1217	break :blk try self.strtab.insert(gpa, name);
1218	1218	};
1219	1219
1220		const src = if (sym.ty.srcLocOrNull(mod)) \|src\|
1221		src.upgrade(mod)
1222		else
1223		Module.SrcLoc{
1224		.file_scope = undefined,
1225		.base_node = undefined,
1226		.lazy = .unneeded,
1227		};
	1220	const src = sym.ty.srcLocOrNull(mod) orelse Module.LazySrcLoc.unneeded;
1228	1221	const res = try codegen.generateLazySymbol(
1229	1222	&elf_file.base,
1230	1223	src,
...	...	@@ -1302,7 +1295,7 @@ pub fn lowerUnnamedConst(
1302	1295	val,
1303	1296	ty.abiAlignment(mod),
1304	1297	elf_file.zig_data_rel_ro_section_index.?,
1305		decl.navSrcLoc(mod).upgrade(mod),
	1298	decl.navSrcLoc(mod),
1306	1299	)) {
1307	1300	.ok => \|sym_index\| sym_index,
1308	1301	.fail => \|em\| {
...	...	@@ -1329,7 +1322,7 @@ fn lowerConst(
1329	1322	val: Value,
1330	1323	required_alignment: InternPool.Alignment,
1331	1324	output_section_index: u32,
1332		src_loc: Module.SrcLoc,
	1325	src_loc: Module.LazySrcLoc,
1333	1326	) !LowerConstResult {
1334	1327	const gpa = elf_file.base.comp.gpa;
1335	1328
...	...	@@ -1395,7 +1388,7 @@ pub fn updateExports(
1395	1388	},
1396	1389	.value => \|value\| self.anon_decls.getPtr(value) orelse blk: {
1397	1390	const first_exp = mod.all_exports.items[export_indices[0]];
1398		const res = try self.lowerAnonDecl(elf_file, value, .none, first_exp.getSrcLoc(mod));
	1391	const res = try self.lowerAnonDecl(elf_file, value, .none, first_exp.src);
1399	1392	switch (res) {
1400	1393	.ok => {},
1401	1394	.fail => \|em\| {
...	...	@@ -1421,7 +1414,7 @@ pub fn updateExports(
1421	1414	try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1);
1422	1415	mod.failed_exports.putAssumeCapacityNoClobber(export_idx, try Module.ErrorMsg.create(
1423	1416	gpa,
1424		exp.getSrcLoc(mod),
	1417	exp.src,
1425	1418	"Unimplemented: ExportOptions.section",
1426	1419	.{},
1427	1420	));
...	...	@@ -1436,7 +1429,7 @@ pub fn updateExports(
1436	1429	try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1);
1437	1430	mod.failed_exports.putAssumeCapacityNoClobber(export_idx, try Module.ErrorMsg.create(
1438	1431	gpa,
1439		exp.getSrcLoc(mod),
	1432	exp.src,
1440	1433	"Unimplemented: GlobalLinkage.LinkOnce",
1441	1434	.{},
1442	1435	));

src/link/MachO.zig+1-1

...	...	@@ -3228,7 +3228,7 @@ pub fn lowerAnonDecl(
3228	3228	self: *MachO,
3229	3229	decl_val: InternPool.Index,
3230	3230	explicit_alignment: InternPool.Alignment,
3231		src_loc: Module.SrcLoc,
	3231	src_loc: Module.LazySrcLoc,
3232	3232	) !codegen.Result {
3233	3233	return self.getZigObject().?.lowerAnonDecl(self, decl_val, explicit_alignment, src_loc);
3234	3234	}

src/link/MachO/ZigObject.zig+9-16

...	...	@@ -572,7 +572,7 @@ pub fn lowerAnonDecl(
572	572	macho_file: *MachO,
573	573	decl_val: InternPool.Index,
574	574	explicit_alignment: Atom.Alignment,
575		src_loc: Module.SrcLoc,
	575	src_loc: Module.LazySrcLoc,
576	576	) !codegen.Result {
577	577	const gpa = macho_file.base.comp.gpa;
578	578	const mod = macho_file.base.comp.module.?;
...	...	@@ -682,7 +682,7 @@ pub fn updateFunc(
682	682	const dio: codegen.DebugInfoOutput = if (decl_state) \|*ds\| .{ .dwarf = ds } else .none;
683	683	const res = try codegen.generateFunction(
684	684	&macho_file.base,
685		decl.navSrcLoc(mod).upgrade(mod),
	685	decl.navSrcLoc(mod),
686	686	func_index,
687	687	air,
688	688	liveness,
...	...	@@ -754,7 +754,7 @@ pub fn updateDecl(
754	754
755	755	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
756	756	const dio: codegen.DebugInfoOutput = if (decl_state) \|*ds\| .{ .dwarf = ds } else .none;
757		const res = try codegen.generateSymbol(&macho_file.base, decl.navSrcLoc(mod).upgrade(mod), decl_val, &code_buffer, dio, .{
	757	const res = try codegen.generateSymbol(&macho_file.base, decl.navSrcLoc(mod), decl_val, &code_buffer, dio, .{
758	758	.parent_atom_index = sym_index,
759	759	});
760	760
...	...	@@ -1100,7 +1100,7 @@ pub fn lowerUnnamedConst(
1100	1100	val,
1101	1101	val.typeOf(mod).abiAlignment(mod),
1102	1102	macho_file.zig_const_sect_index.?,
1103		decl.navSrcLoc(mod).upgrade(mod),
	1103	decl.navSrcLoc(mod),
1104	1104	)) {
1105	1105	.ok => \|sym_index\| sym_index,
1106	1106	.fail => \|em\| {
...	...	@@ -1127,7 +1127,7 @@ fn lowerConst(
1127	1127	val: Value,
1128	1128	required_alignment: Atom.Alignment,
1129	1129	output_section_index: u8,
1130		src_loc: Module.SrcLoc,
	1130	src_loc: Module.LazySrcLoc,
1131	1131	) !LowerConstResult {
1132	1132	const gpa = macho_file.base.comp.gpa;
1133	1133
...	...	@@ -1196,7 +1196,7 @@ pub fn updateExports(
1196	1196	},
1197	1197	.value => \|value\| self.anon_decls.getPtr(value) orelse blk: {
1198	1198	const first_exp = mod.all_exports.items[export_indices[0]];
1199		const res = try self.lowerAnonDecl(macho_file, value, .none, first_exp.getSrcLoc(mod));
	1199	const res = try self.lowerAnonDecl(macho_file, value, .none, first_exp.src);
1200	1200	switch (res) {
1201	1201	.ok => {},
1202	1202	.fail => \|em\| {
...	...	@@ -1221,7 +1221,7 @@ pub fn updateExports(
1221	1221	try mod.failed_exports.ensureUnusedCapacity(mod.gpa, 1);
1222	1222	mod.failed_exports.putAssumeCapacityNoClobber(export_idx, try Module.ErrorMsg.create(
1223	1223	gpa,
1224		exp.getSrcLoc(mod),
	1224	exp.src,
1225	1225	"Unimplemented: ExportOptions.section",
1226	1226	.{},
1227	1227	));
...	...	@@ -1231,7 +1231,7 @@ pub fn updateExports(
1231	1231	if (exp.opts.linkage == .link_once) {
1232	1232	try mod.failed_exports.putNoClobber(mod.gpa, export_idx, try Module.ErrorMsg.create(
1233	1233	gpa,
1234		exp.getSrcLoc(mod),
	1234	exp.src,
1235	1235	"Unimplemented: GlobalLinkage.link_once",
1236	1236	.{},
1237	1237	));
...	...	@@ -1291,14 +1291,7 @@ fn updateLazySymbol(
1291	1291	break :blk try self.strtab.insert(gpa, name);
1292	1292	};
1293	1293
1294		const src = if (lazy_sym.ty.srcLocOrNull(mod)) \|src\|
1295		src.upgrade(mod)
1296		else
1297		Module.SrcLoc{
1298		.file_scope = undefined,
1299		.base_node = undefined,
1300		.lazy = .unneeded,
1301		};
	1294	const src = lazy_sym.ty.srcLocOrNull(mod) orelse Module.LazySrcLoc.unneeded;
1302	1295	const res = try codegen.generateLazySymbol(
1303	1296	&macho_file.base,
1304	1297	src,

src/link/Plan9.zig+6-13

...	...	@@ -439,7 +439,7 @@ pub fn updateFunc(self: Plan9, mod: Module, func_index: InternPool.Index, air:
439	439
440	440	const res = try codegen.generateFunction(
441	441	&self.base,
442		decl.navSrcLoc(mod).upgrade(mod),
	442	decl.navSrcLoc(mod),
443	443	func_index,
444	444	air,
445	445	liveness,
...	...	@@ -505,7 +505,7 @@ pub fn lowerUnnamedConst(self: *Plan9, val: Value, decl_index: InternPool.DeclIn
505	505	};
506	506	self.syms.items[info.sym_index.?] = sym;
507	507
508		const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod).upgrade(mod), val, &code_buffer, .{
	508	const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod), val, &code_buffer, .{
509	509	.none = {},
510	510	}, .{
511	511	.parent_atom_index = new_atom_idx,
...	...	@@ -544,7 +544,7 @@ pub fn updateDecl(self: Plan9, mod: Module, decl_index: InternPool.DeclIndex)
544	544	defer code_buffer.deinit();
545	545	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
546	546	// TODO we need the symbol index for symbol in the table of locals for the containing atom
547		const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod).upgrade(mod), decl_val, &code_buffer, .{ .none = {} }, .{
	547	const res = try codegen.generateSymbol(&self.base, decl.navSrcLoc(mod), decl_val, &code_buffer, .{ .none = {} }, .{
548	548	.parent_atom_index = @as(Atom.Index, @intCast(atom_idx)),
549	549	});
550	550	const code = switch (res) {
...	...	@@ -1027,7 +1027,7 @@ fn addDeclExports(
1027	1027	{
1028	1028	try mod.failed_exports.put(mod.gpa, export_idx, try Module.ErrorMsg.create(
1029	1029	gpa,
1030		mod.declPtr(decl_index).navSrcLoc(mod).upgrade(mod),
	1030	mod.declPtr(decl_index).navSrcLoc(mod),
1031	1031	"plan9 does not support extra sections",
1032	1032	.{},
1033	1033	));
...	...	@@ -1225,14 +1225,7 @@ fn updateLazySymbolAtom(self: *Plan9, sym: File.LazySymbol, atom_index: Atom.Ind
1225	1225	self.syms.items[self.getAtomPtr(atom_index).sym_index.?] = symbol;
1226	1226
1227	1227	// generate the code
1228		const src = if (sym.ty.srcLocOrNull(mod)) \|src\|
1229		src.upgrade(mod)
1230		else
1231		Module.SrcLoc{
1232		.file_scope = undefined,
1233		.base_node = undefined,
1234		.lazy = .unneeded,
1235		};
	1228	const src = sym.ty.srcLocOrNull(mod) orelse Module.LazySrcLoc.unneeded;
1236	1229	const res = try codegen.generateLazySymbol(
1237	1230	&self.base,
1238	1231	src,
...	...	@@ -1553,7 +1546,7 @@ pub fn lowerAnonDecl(
1553	1546	self: *Plan9,
1554	1547	decl_val: InternPool.Index,
1555	1548	explicit_alignment: InternPool.Alignment,
1556		src_loc: Module.SrcLoc,
	1549	src_loc: Module.LazySrcLoc,
1557	1550	) !codegen.Result {
1558	1551	_ = explicit_alignment;
1559	1552	// This is basically the same as lowerUnnamedConst.

src/link/Wasm.zig+1-1

...	...	@@ -1533,7 +1533,7 @@ pub fn lowerAnonDecl(
1533	1533	wasm: *Wasm,
1534	1534	decl_val: InternPool.Index,
1535	1535	explicit_alignment: Alignment,
1536		src_loc: Module.SrcLoc,
	1536	src_loc: Module.LazySrcLoc,
1537	1537	) !codegen.Result {
1538	1538	return wasm.zigObjectPtr().?.lowerAnonDecl(wasm, decl_val, explicit_alignment, src_loc);
1539	1539	}

src/link/Wasm/ZigObject.zig+7-7

...	...	@@ -269,7 +269,7 @@ pub fn updateDecl(
269	269
270	270	const res = try codegen.generateSymbol(
271	271	&wasm_file.base,
272		decl.navSrcLoc(mod).upgrade(mod),
	272	decl.navSrcLoc(mod),
273	273	val,
274	274	&code_writer,
275	275	.none,
...	...	@@ -308,7 +308,7 @@ pub fn updateFunc(
308	308	defer code_writer.deinit();
309	309	const result = try codegen.generateFunction(
310	310	&wasm_file.base,
311		decl.navSrcLoc(mod).upgrade(mod),
	311	decl.navSrcLoc(mod),
312	312	func_index,
313	313	air,
314	314	liveness,
...	...	@@ -439,7 +439,7 @@ pub fn lowerAnonDecl(
439	439	wasm_file: *Wasm,
440	440	decl_val: InternPool.Index,
441	441	explicit_alignment: InternPool.Alignment,
442		src_loc: Module.SrcLoc,
	442	src_loc: Module.LazySrcLoc,
443	443	) !codegen.Result {
444	444	const gpa = wasm_file.base.comp.gpa;
445	445	const gop = try zig_object.anon_decls.getOrPut(gpa, decl_val);
...	...	@@ -494,7 +494,7 @@ pub fn lowerUnnamedConst(zig_object: ZigObject, wasm_file: Wasm, val: Value, d
494	494	else
495	495	decl.navSrcLoc(mod);
496	496
497		switch (try zig_object.lowerConst(wasm_file, name, val, decl_src.upgrade(mod))) {
	497	switch (try zig_object.lowerConst(wasm_file, name, val, decl_src)) {
498	498	.ok => \|atom_index\| {
499	499	try wasm_file.getAtomPtr(parent_atom_index).locals.append(gpa, atom_index);
500	500	return @intFromEnum(wasm_file.getAtom(atom_index).sym_index);
...	...	@@ -512,7 +512,7 @@ const LowerConstResult = union(enum) {
512	512	fail: *Module.ErrorMsg,
513	513	};
514	514
515		fn lowerConst(zig_object: ZigObject, wasm_file: Wasm, name: []const u8, val: Value, src_loc: Module.SrcLoc) !LowerConstResult {
	515	fn lowerConst(zig_object: ZigObject, wasm_file: Wasm, name: []const u8, val: Value, src_loc: Module.LazySrcLoc) !LowerConstResult {
516	516	const gpa = wasm_file.base.comp.gpa;
517	517	const mod = wasm_file.base.comp.module.?;
518	518
...	...	@@ -882,7 +882,7 @@ pub fn updateExports(
882	882	if (exp.opts.section.toSlice(&mod.intern_pool)) \|section\| {
883	883	try mod.failed_exports.putNoClobber(gpa, export_idx, try Module.ErrorMsg.create(
884	884	gpa,
885		decl.navSrcLoc(mod).upgrade(mod),
	885	decl.navSrcLoc(mod),
886	886	"Unimplemented: ExportOptions.section '{s}'",
887	887	.{section},
888	888	));
...	...	@@ -915,7 +915,7 @@ pub fn updateExports(
915	915	.link_once => {
916	916	try mod.failed_exports.putNoClobber(gpa, export_idx, try Module.ErrorMsg.create(
917	917	gpa,
918		decl.navSrcLoc(mod).upgrade(mod),
	918	decl.navSrcLoc(mod),
919	919	"Unimplemented: LinkOnce",
920	920	.{},
921	921	));

author	Matthew Lugg <mlugg@mlugg.co.uk> 2024-06-30 03:00:07+01:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2024-07-04 21:01:41+01:00
log	ded5c759f83a4da355a128dd4d7f5e22cbd3cabe
tree	b862bbdf36b892e9c39f472c6759f084c87d64b2
parent	089bbd6588d82ccda0646e756006cf5787eadef2
signature	Commit is signed but in an unrecognized format.

Zcu: store `LazySrcLoc` in error messages