Commit 1c13ca5a05978011283ff55a586443b10b69fc85 | zig

author	LemonBoy <thatlemon@gmail.com> 2020-11-26 13:19:30+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-01-02 17:12:57-07:00
log	1c13ca5a05978011283ff55a586443b10b69fc85
tree	30a411c8e359467ba520d3f8e68ebf8500aceffa
parent	dd973fb365dbbe11ce5beac8b4889bfab3fddc4d

stage2: Use {s} instead of {} when formatting strings

27 files changed, 503 insertions(+), 360 deletions(-)

lib/std/meta/trait.zig+14

...	@@ -298,6 +298,20 @@ pub fn isNumber(comptime T: type) bool {	...	@@ -298,6 +298,20 @@ pub fn isNumber(comptime T: type) bool {
298	};	298	};
299	}	299	}
300		300
		301	pub fn isIntegerNumber(comptime T: type) bool {
		302	return switch (@typeInfo(T)) {
		303	.Int, .ComptimeInt => true,
		304	else => false,
		305	};
		306	}
		307
		308	pub fn isFloatingNumber(comptime T: type) bool {
		309	return switch (@typeInfo(T)) {
		310	.Float, .ComptimeFloat => true,
		311	else => false,
		312	};
		313	}
		314
301	test "std.meta.trait.isNumber" {	315	test "std.meta.trait.isNumber" {
302	const NotANumber = struct {	316	const NotANumber = struct {
303	number: u8,	317	number: u8,

src/Cache.zig+2-2

...	@@ -549,7 +549,7 @@ pub const Manifest = struct {	...	@@ -549,7 +549,7 @@ pub const Manifest = struct {
549	.target, .target_must_resolve, .prereq => {},	549	.target, .target_must_resolve, .prereq => {},
550	else => \|err\| {	550	else => \|err\| {
551	try err.printError(error_buf.writer());	551	try err.printError(error_buf.writer());
552	std.log.err("failed parsing {}: {}", .{ dep_file_basename, error_buf.items });	552	std.log.err("failed parsing {s}: {s}", .{ dep_file_basename, error_buf.items });
553	return error.InvalidDepFile;	553	return error.InvalidDepFile;
554	},	554	},
555	}	555	}
...	@@ -561,7 +561,7 @@ pub const Manifest = struct {	...	@@ -561,7 +561,7 @@ pub const Manifest = struct {
561	.prereq => \|bytes\| try self.addFilePost(bytes),	561	.prereq => \|bytes\| try self.addFilePost(bytes),
562	else => \|err\| {	562	else => \|err\| {
563	try err.printError(error_buf.writer());	563	try err.printError(error_buf.writer());
564	std.log.err("failed parsing {}: {}", .{ dep_file_basename, error_buf.items });	564	std.log.err("failed parsing {s}: {s}", .{ dep_file_basename, error_buf.items });
565	return error.InvalidDepFile;	565	return error.InvalidDepFile;
566	},	566	},
567	}	567	}

src/Compilation.zig+47-47

src/DepTokenizer.zig+3-3

...	@@ -366,7 +366,7 @@ pub const Token = union(enum) {	...	@@ -366,7 +366,7 @@ pub const Token = union(enum) {
366	.incomplete_quoted_prerequisite,	366	.incomplete_quoted_prerequisite,
367	.incomplete_target,	367	.incomplete_target,
368	=> \|index_and_bytes\| {	368	=> \|index_and_bytes\| {
369	try writer.print("{} '", .{self.errStr()});	369	try writer.print("{s} '", .{self.errStr()});
370	if (self == .incomplete_target) {	370	if (self == .incomplete_target) {
371	const tmp = Token{ .target_must_resolve = index_and_bytes.bytes };	371	const tmp = Token{ .target_must_resolve = index_and_bytes.bytes };
372	try tmp.resolve(writer);	372	try tmp.resolve(writer);
...	@@ -383,7 +383,7 @@ pub const Token = union(enum) {	...	@@ -383,7 +383,7 @@ pub const Token = union(enum) {
383	=> \|index_and_char\| {	383	=> \|index_and_char\| {
384	try writer.writeAll("illegal char ");	384	try writer.writeAll("illegal char ");
385	try printUnderstandableChar(writer, index_and_char.char);	385	try printUnderstandableChar(writer, index_and_char.char);
386	try writer.print(" at position {}: {}", .{ index_and_char.index, self.errStr() });	386	try writer.print(" at position {}: {s}", .{ index_and_char.index, self.errStr() });
387	},	387	},
388	}	388	}
389	}	389	}
...	@@ -943,7 +943,7 @@ fn printSection(out: anytype, label: []const u8, bytes: []const u8) !void {	...	@@ -943,7 +943,7 @@ fn printSection(out: anytype, label: []const u8, bytes: []const u8) !void {
943		943
944	fn printLabel(out: anytype, label: []const u8, bytes: []const u8) !void {	944	fn printLabel(out: anytype, label: []const u8, bytes: []const u8) !void {
945	var buf: [80]u8 = undefined;	945	var buf: [80]u8 = undefined;
946	var text = try std.fmt.bufPrint(buf[0..], "{} {} bytes ", .{ label, bytes.len });	946	var text = try std.fmt.bufPrint(buf[0..], "{s} {} bytes ", .{ label, bytes.len });
947	try out.writeAll(text);	947	try out.writeAll(text);
948	var i: usize = text.len;	948	var i: usize = text.len;
949	const end = 79;	949	const end = 79;

src/Module.zig+8-8

src/astgen.zig+4-4

src/codegen.zig+19-19

src/codegen/c.zig+8-7

...	@@ -235,7 +235,7 @@ fn renderFunctionSignature(	...	@@ -235,7 +235,7 @@ fn renderFunctionSignature(
235	try writer.writeAll(", ");	235	try writer.writeAll(", ");
236	}	236	}
237	try renderType(ctx, writer, tv.ty.fnParamType(index));	237	try renderType(ctx, writer, tv.ty.fnParamType(index));
238	try writer.print(" arg{}", .{index});	238	try writer.print(" arg{d}", .{index});
239	}	239	}
240	}	240	}
241	try writer.writeByte(')');	241	try writer.writeByte(')');
...	@@ -481,8 +481,9 @@ fn genBinOp(ctx: Context, file: C, inst: *Inst.BinOp, operator: []const u8) !?	...	@@ -481,8 +481,9 @@ fn genBinOp(ctx: Context, file: C, inst: *Inst.BinOp, operator: []const u8) !?
481	const rhs = try ctx.resolveInst(inst.rhs);	481	const rhs = try ctx.resolveInst(inst.rhs);
482	const writer = file.main.writer();	482	const writer = file.main.writer();
483	const name = try ctx.name();	483	const name = try ctx.name();
484	try renderTypeAndName(ctx, writer, inst.base.ty, name, .Const);	484	try writer.writeAll(indentation ++ "const ");
485	try writer.print(" = {s} {s} {s};\n", .{ lhs, operator, rhs });	485	try renderType(ctx, writer, inst.base.ty);
		486	try writer.print(" {s} = {s} " ++ operator ++ " {s};\n", .{ name, lhs, rhs });
486	return name;	487	return name;
487	}	488	}
488		489
...	@@ -587,7 +588,7 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {	...	@@ -587,7 +588,7 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {
587	const arg = as.args[index];	588	const arg = as.args[index];
588	try writer.writeAll("register ");	589	try writer.writeAll("register ");
589	try renderType(ctx, writer, arg.ty);	590	try renderType(ctx, writer, arg.ty);
590	try writer.print(" {}_constant __asm__(\"{}\") = ", .{ reg, reg });	591	try writer.print(" {s}_constant __asm__(\"{s}\") = ", .{ reg, reg });
591	// TODO merge constant handling into inst_map as well	592	// TODO merge constant handling into inst_map as well
592	if (arg.castTag(.constant)) \|c\| {	593	if (arg.castTag(.constant)) \|c\| {
593	try renderValue(ctx, writer, arg.ty, c.val);	594	try renderValue(ctx, writer, arg.ty, c.val);
...	@@ -597,13 +598,13 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {	...	@@ -597,13 +598,13 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {
597	if (!gop.found_existing) {	598	if (!gop.found_existing) {
598	return ctx.fail(ctx.decl.src(), "Internal error in C backend: asm argument not found in inst_map", .{});	599	return ctx.fail(ctx.decl.src(), "Internal error in C backend: asm argument not found in inst_map", .{});
599	}	600	}
600	try writer.print("{};\n ", .{gop.entry.value});	601	try writer.print("{s};\n ", .{gop.entry.value});
601	}	602	}
602	} else {	603	} else {
603	return ctx.fail(ctx.decl.src(), "TODO non-explicit inline asm regs", .{});	604	return ctx.fail(ctx.decl.src(), "TODO non-explicit inline asm regs", .{});
604	}	605	}
605	}	606	}
606	try writer.print("__asm {} (\"{}\"", .{ if (as.is_volatile) @as([]const u8, "volatile") else "", as.asm_source });	607	try writer.print("__asm {s} (\"{s}\"", .{ if (as.is_volatile) @as([]const u8, "volatile") else "", as.asm_source });
607	if (as.output) \|o\| {	608	if (as.output) \|o\| {
608	return ctx.fail(ctx.decl.src(), "TODO inline asm output", .{});	609	return ctx.fail(ctx.decl.src(), "TODO inline asm output", .{});
609	}	610	}
...	@@ -619,7 +620,7 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {	...	@@ -619,7 +620,7 @@ fn genAsm(ctx: Context, file: C, as: *Inst.Assembly) !?[]u8 {
619	if (index > 0) {	620	if (index > 0) {
620	try writer.writeAll(", ");	621	try writer.writeAll(", ");
621	}	622	}
622	try writer.print("\"\"({}_constant)", .{reg});	623	try writer.print("\"\"({s}_constant)", .{reg});
623	} else {	624	} else {
624	// This is blocked by the earlier test	625	// This is blocked by the earlier test
625	unreachable;	626	unreachable;

src/codegen/llvm.zig created+125

...	@@ -0,0 +1,125 @@
1	const std = @import("std");
2	const Allocator = std.mem.Allocator;
3
4	pub fn targetTriple(allocator: *Allocator, target: std.Target) ![]u8 {
5	const llvm_arch = switch (target.cpu.arch) {
6	.arm => "arm",
7	.armeb => "armeb",
8	.aarch64 => "aarch64",
9	.aarch64_be => "aarch64_be",
10	.aarch64_32 => "aarch64_32",
11	.arc => "arc",
12	.avr => "avr",
13	.bpfel => "bpfel",
14	.bpfeb => "bpfeb",
15	.hexagon => "hexagon",
16	.mips => "mips",
17	.mipsel => "mipsel",
18	.mips64 => "mips64",
19	.mips64el => "mips64el",
20	.msp430 => "msp430",
21	.powerpc => "powerpc",
22	.powerpc64 => "powerpc64",
23	.powerpc64le => "powerpc64le",
24	.r600 => "r600",
25	.amdgcn => "amdgcn",
26	.riscv32 => "riscv32",
27	.riscv64 => "riscv64",
28	.sparc => "sparc",
29	.sparcv9 => "sparcv9",
30	.sparcel => "sparcel",
31	.s390x => "s390x",
32	.tce => "tce",
33	.tcele => "tcele",
34	.thumb => "thumb",
35	.thumbeb => "thumbeb",
36	.i386 => "i386",
37	.x86_64 => "x86_64",
38	.xcore => "xcore",
39	.nvptx => "nvptx",
40	.nvptx64 => "nvptx64",
41	.le32 => "le32",
42	.le64 => "le64",
43	.amdil => "amdil",
44	.amdil64 => "amdil64",
45	.hsail => "hsail",
46	.hsail64 => "hsail64",
47	.spir => "spir",
48	.spir64 => "spir64",
49	.kalimba => "kalimba",
50	.shave => "shave",
51	.lanai => "lanai",
52	.wasm32 => "wasm32",
53	.wasm64 => "wasm64",
54	.renderscript32 => "renderscript32",
55	.renderscript64 => "renderscript64",
56	.ve => "ve",
57	.spu_2 => return error.LLVMBackendDoesNotSupportSPUMarkII,
58	};
59	// TODO Add a sub-arch for some architectures depending on CPU features.
60
61	const llvm_os = switch (target.os.tag) {
62	.freestanding => "unknown",
63	.ananas => "ananas",
64	.cloudabi => "cloudabi",
65	.dragonfly => "dragonfly",
66	.freebsd => "freebsd",
67	.fuchsia => "fuchsia",
68	.ios => "ios",
69	.kfreebsd => "kfreebsd",
70	.linux => "linux",
71	.lv2 => "lv2",
72	.macos => "macosx",
73	.netbsd => "netbsd",
74	.openbsd => "openbsd",
75	.solaris => "solaris",
76	.windows => "windows",
77	.haiku => "haiku",
78	.minix => "minix",
79	.rtems => "rtems",
80	.nacl => "nacl",
81	.cnk => "cnk",
82	.aix => "aix",
83	.cuda => "cuda",
84	.nvcl => "nvcl",
85	.amdhsa => "amdhsa",
86	.ps4 => "ps4",
87	.elfiamcu => "elfiamcu",
88	.tvos => "tvos",
89	.watchos => "watchos",
90	.mesa3d => "mesa3d",
91	.contiki => "contiki",
92	.amdpal => "amdpal",
93	.hermit => "hermit",
94	.hurd => "hurd",
95	.wasi => "wasi",
96	.emscripten => "emscripten",
97	.uefi => "windows",
98	.other => "unknown",
99	};
100
101	const llvm_abi = switch (target.abi) {
102	.none => "unknown",
103	.gnu => "gnu",
104	.gnuabin32 => "gnuabin32",
105	.gnuabi64 => "gnuabi64",
106	.gnueabi => "gnueabi",
107	.gnueabihf => "gnueabihf",
108	.gnux32 => "gnux32",
109	.code16 => "code16",
110	.eabi => "eabi",
111	.eabihf => "eabihf",
112	.android => "android",
113	.musl => "musl",
114	.musleabi => "musleabi",
115	.musleabihf => "musleabihf",
116	.msvc => "msvc",
117	.itanium => "itanium",
118	.cygnus => "cygnus",
119	.coreclr => "coreclr",
120	.simulator => "simulator",
121	.macabi => "macabi",
122	};
123
124	return std.fmt.allocPrint(allocator, "{s}-unknown-{s}-{s}", .{ llvm_arch, llvm_os, llvm_abi });
125	}

src/glibc.zig+13-13

src/libc_installation.zig+16-16

...	@@ -83,7 +83,7 @@ pub const LibCInstallation = struct {	...	@@ -83,7 +83,7 @@ pub const LibCInstallation = struct {
83	}	83	}
84	inline for (fields) \|field, i\| {	84	inline for (fields) \|field, i\| {
85	if (!found_keys[i].found) {	85	if (!found_keys[i].found) {
86	log.err("missing field: {}\n", .{field.name});	86	log.err("missing field: {s}\n", .{field.name});
87	return error.ParseError;	87	return error.ParseError;
88	}	88	}
89	}	89	}
...	@@ -96,18 +96,18 @@ pub const LibCInstallation = struct {	...	@@ -96,18 +96,18 @@ pub const LibCInstallation = struct {
96	return error.ParseError;	96	return error.ParseError;
97	}	97	}
98	if (self.crt_dir == null and !is_darwin) {	98	if (self.crt_dir == null and !is_darwin) {
99	log.err("crt_dir may not be empty for {}\n", .{@tagName(Target.current.os.tag)});	99	log.err("crt_dir may not be empty for {s}\n", .{@tagName(Target.current.os.tag)});
100	return error.ParseError;	100	return error.ParseError;
101	}	101	}
102	if (self.msvc_lib_dir == null and is_windows and !is_gnu) {	102	if (self.msvc_lib_dir == null and is_windows and !is_gnu) {
103	log.err("msvc_lib_dir may not be empty for {}-{}\n", .{	103	log.err("msvc_lib_dir may not be empty for {s}-{s}\n", .{
104	@tagName(Target.current.os.tag),	104	@tagName(Target.current.os.tag),
105	@tagName(Target.current.abi),	105	@tagName(Target.current.abi),
106	});	106	});
107	return error.ParseError;	107	return error.ParseError;
108	}	108	}
109	if (self.kernel32_lib_dir == null and is_windows and !is_gnu) {	109	if (self.kernel32_lib_dir == null and is_windows and !is_gnu) {
110	log.err("kernel32_lib_dir may not be empty for {}-{}\n", .{	110	log.err("kernel32_lib_dir may not be empty for {s}-{s}\n", .{
111	@tagName(Target.current.os.tag),	111	@tagName(Target.current.os.tag),
112	@tagName(Target.current.abi),	112	@tagName(Target.current.abi),
113	});	113	});
...	@@ -128,25 +128,25 @@ pub const LibCInstallation = struct {	...	@@ -128,25 +128,25 @@ pub const LibCInstallation = struct {
128	try out.print(	128	try out.print(
129	\\# The directory that contains `stdlib.h`.	129	\\# The directory that contains `stdlib.h`.
130	\\# On POSIX-like systems, include directories be found with: `cc -E -Wp,-v -xc /dev/null`	130	\\# On POSIX-like systems, include directories be found with: `cc -E -Wp,-v -xc /dev/null`
131	\\include_dir={}	131	\\include_dir={s}
132	\\	132	\\
133	\\# The system-specific include directory. May be the same as `include_dir`.	133	\\# The system-specific include directory. May be the same as `include_dir`.
134	\\# On Windows it's the directory that includes `vcruntime.h`.	134	\\# On Windows it's the directory that includes `vcruntime.h`.
135	\\# On POSIX it's the directory that includes `sys/errno.h`.	135	\\# On POSIX it's the directory that includes `sys/errno.h`.
136	\\sys_include_dir={}	136	\\sys_include_dir={s}
137	\\	137	\\
138	\\# The directory that contains `crt1.o` or `crt2.o`.	138	\\# The directory that contains `crt1.o` or `crt2.o`.
139	\\# On POSIX, can be found with `cc -print-file-name=crt1.o`.	139	\\# On POSIX, can be found with `cc -print-file-name=crt1.o`.
140	\\# Not needed when targeting MacOS.	140	\\# Not needed when targeting MacOS.
141	\\crt_dir={}	141	\\crt_dir={s}
142	\\	142	\\
143	\\# The directory that contains `vcruntime.lib`.	143	\\# The directory that contains `vcruntime.lib`.
144	\\# Only needed when targeting MSVC on Windows.	144	\\# Only needed when targeting MSVC on Windows.
145	\\msvc_lib_dir={}	145	\\msvc_lib_dir={s}
146	\\	146	\\
147	\\# The directory that contains `kernel32.lib`.	147	\\# The directory that contains `kernel32.lib`.
148	\\# Only needed when targeting MSVC on Windows.	148	\\# Only needed when targeting MSVC on Windows.
149	\\kernel32_lib_dir={}	149	\\kernel32_lib_dir={s}
150	\\	150	\\
151	, .{	151	, .{
152	include_dir,	152	include_dir,
...	@@ -338,7 +338,7 @@ pub const LibCInstallation = struct {	...	@@ -338,7 +338,7 @@ pub const LibCInstallation = struct {
338		338
339	for (searches) \|search\| {	339	for (searches) \|search\| {
340	result_buf.shrink(0);	340	result_buf.shrink(0);
341	try result_buf.outStream().print("{}\\Include\\{}\\ucrt", .{ search.path, search.version });	341	try result_buf.outStream().print("{s}\\Include\\{s}\\ucrt", .{ search.path, search.version });
342		342
343	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {	343	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {
344	error.FileNotFound,	344	error.FileNotFound,
...	@@ -384,7 +384,7 @@ pub const LibCInstallation = struct {	...	@@ -384,7 +384,7 @@ pub const LibCInstallation = struct {
384		384
385	for (searches) \|search\| {	385	for (searches) \|search\| {
386	result_buf.shrink(0);	386	result_buf.shrink(0);
387	try result_buf.outStream().print("{}\\Lib\\{}\\ucrt\\{}", .{ search.path, search.version, arch_sub_dir });	387	try result_buf.outStream().print("{s}\\Lib\\{s}\\ucrt\\{s}", .{ search.path, search.version, arch_sub_dir });
388		388
389	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {	389	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {
390	error.FileNotFound,	390	error.FileNotFound,
...	@@ -439,7 +439,7 @@ pub const LibCInstallation = struct {	...	@@ -439,7 +439,7 @@ pub const LibCInstallation = struct {
439	for (searches) \|search\| {	439	for (searches) \|search\| {
440	result_buf.shrink(0);	440	result_buf.shrink(0);
441	const stream = result_buf.outStream();	441	const stream = result_buf.outStream();
442	try stream.print("{}\\Lib\\{}\\um\\{}", .{ search.path, search.version, arch_sub_dir });	442	try stream.print("{s}\\Lib\\{s}\\um\\{s}", .{ search.path, search.version, arch_sub_dir });
443		443
444	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {	444	var dir = fs.cwd().openDir(result_buf.items, .{}) catch \|err\| switch (err) {
445	error.FileNotFound,	445	error.FileNotFound,
...	@@ -520,7 +520,7 @@ fn ccPrintFileName(args: CCPrintFileNameOptions) ![:0]u8 {	...	@@ -520,7 +520,7 @@ fn ccPrintFileName(args: CCPrintFileNameOptions) ![:0]u8 {
520	const allocator = args.allocator;	520	const allocator = args.allocator;
521		521
522	const cc_exe = std.os.getenvZ("CC") orelse default_cc_exe;	522	const cc_exe = std.os.getenvZ("CC") orelse default_cc_exe;
523	const arg1 = try std.fmt.allocPrint(allocator, "-print-file-name={}", .{args.search_basename});	523	const arg1 = try std.fmt.allocPrint(allocator, "-print-file-name={s}", .{args.search_basename});
524	defer allocator.free(arg1);	524	defer allocator.free(arg1);
525	const argv = [_][]const u8{ cc_exe, arg1 };	525	const argv = [_][]const u8{ cc_exe, arg1 };
526		526
...	@@ -584,17 +584,17 @@ fn printVerboseInvocation(	...	@@ -584,17 +584,17 @@ fn printVerboseInvocation(
584	if (!verbose) return;	584	if (!verbose) return;
585		585
586	if (search_basename) \|s\| {	586	if (search_basename) \|s\| {
587	std.debug.warn("Zig attempted to find the file '{}' by executing this command:\n", .{s});	587	std.debug.warn("Zig attempted to find the file '{s}' by executing this command:\n", .{s});
588	} else {	588	} else {
589	std.debug.warn("Zig attempted to find the path to native system libc headers by executing this command:\n", .{});	589	std.debug.warn("Zig attempted to find the path to native system libc headers by executing this command:\n", .{});
590	}	590	}
591	for (argv) \|arg, i\| {	591	for (argv) \|arg, i\| {
592	if (i != 0) std.debug.warn(" ", .{});	592	if (i != 0) std.debug.warn(" ", .{});
593	std.debug.warn("{}", .{arg});	593	std.debug.warn("{s}", .{arg});
594	}	594	}
595	std.debug.warn("\n", .{});	595	std.debug.warn("\n", .{});
596	if (stderr) \|s\| {	596	if (stderr) \|s\| {
597	std.debug.warn("Output:\n==========\n{}\n==========\n", .{s});	597	std.debug.warn("Output:\n==========\n{s}\n==========\n", .{s});
598	}	598	}
599	}	599	}
600		600

src/link.zig+4-4

...	@@ -560,9 +560,9 @@ pub const File = struct {	...	@@ -560,9 +560,9 @@ pub const File = struct {
560	const full_out_path_z = try arena.dupeZ(u8, full_out_path);	560	const full_out_path_z = try arena.dupeZ(u8, full_out_path);
561		561
562	if (base.options.verbose_link) {	562	if (base.options.verbose_link) {
563	std.debug.print("ar rcs {}", .{full_out_path_z});	563	std.debug.print("ar rcs {s}", .{full_out_path_z});
564	for (object_files.items) \|arg\| {	564	for (object_files.items) \|arg\| {
565	std.debug.print(" {}", .{arg});	565	std.debug.print(" {s}", .{arg});
566	}	566	}
567	std.debug.print("\n", .{});	567	std.debug.print("\n", .{});
568	}	568	}
...	@@ -574,11 +574,11 @@ pub const File = struct {	...	@@ -574,11 +574,11 @@ pub const File = struct {
574		574
575	if (!base.options.disable_lld_caching) {	575	if (!base.options.disable_lld_caching) {
576	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {	576	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {
577	log.warn("failed to save archive hash digest file: {}", .{@errorName(err)});	577	log.warn("failed to save archive hash digest file: {s}", .{@errorName(err)});
578	};	578	};
579		579
580	man.writeManifest() catch \|err\| {	580	man.writeManifest() catch \|err\| {
581	log.warn("failed to write cache manifest when archiving: {}", .{@errorName(err)});	581	log.warn("failed to write cache manifest when archiving: {s}", .{@errorName(err)});
582	};	582	};
583		583
584	base.lock = man.toOwnedLock();	584	base.lock = man.toOwnedLock();

src/link/C.zig+4-1

 @@ -111,8 +111,11 @@ pub fn flushModule(self: *C, comp: *Compilation) !void {
     if (self.header.buf.items.len > 0) {
         try writer.writeByte('\n');
     }
+    if (self.header.items.len > 0) {
+        try writer.print("{s}\n", .{self.header.items});
+    }
     if (self.constants.items.len > 0) {
-        try writer.print("{}\n", .{self.constants.items});
+        try writer.print("{s}\n", .{self.constants.items});
     }
     if (self.main.items.len > 1) {
         const last_two = self.main.items[self.main.items.len - 2 ..];

src/link/Coff.zig+5-5

src/link/Elf.zig+9-9

src/link/MachO.zig+11-11

src/link/Wasm.zig+3-3

src/main.zig+118-118

src/mingw.zig+2-2

...	@@ -381,7 +381,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {	...	@@ -381,7 +381,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
381		381
382	const term = child.wait() catch \|err\| {	382	const term = child.wait() catch \|err\| {
383	// TODO surface a proper error here	383	// TODO surface a proper error here
384	log.err("unable to spawn {}: {}", .{ args[0], @errorName(err) });	384	log.err("unable to spawn {s}: {s}", .{ args[0], @errorName(err) });
385	return error.ClangPreprocessorFailed;	385	return error.ClangPreprocessorFailed;
386	};	386	};
387		387
...	@@ -395,7 +395,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {	...	@@ -395,7 +395,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
395	},	395	},
396	else => {	396	else => {
397	// TODO surface a proper error here	397	// TODO surface a proper error here
398	log.err("clang terminated unexpectedly with stderr: {}", .{stderr});	398	log.err("clang terminated unexpectedly with stderr: {s}", .{stderr});
399	return error.ClangPreprocessorFailed;	399	return error.ClangPreprocessorFailed;
400	},	400	},
401	}	401	}

src/musl.zig+4-4

src/print_env.zig+1-1

...	@@ -9,7 +9,7 @@ pub fn cmdEnv(gpa: *Allocator, args: []const []const u8, stdout: std.fs.File.Wri	...	@@ -9,7 +9,7 @@ pub fn cmdEnv(gpa: *Allocator, args: []const []const u8, stdout: std.fs.File.Wri
9	defer gpa.free(self_exe_path);	9	defer gpa.free(self_exe_path);
10		10
11	var zig_lib_directory = introspect.findZigLibDirFromSelfExe(gpa, self_exe_path) catch \|err\| {	11	var zig_lib_directory = introspect.findZigLibDirFromSelfExe(gpa, self_exe_path) catch \|err\| {
12	fatal("unable to find zig installation directory: {}\n", .{@errorName(err)});	12	fatal("unable to find zig installation directory: {s}\n", .{@errorName(err)});
13	};	13	};
14	defer gpa.free(zig_lib_directory.path.?);	14	defer gpa.free(zig_lib_directory.path.?);
15	defer zig_lib_directory.handle.close();	15	defer zig_lib_directory.handle.close();

src/print_targets.zig+2-2

...	@@ -18,7 +18,7 @@ pub fn cmdTargets(	...	@@ -18,7 +18,7 @@ pub fn cmdTargets(
18	native_target: Target,	18	native_target: Target,
19	) !void {	19	) !void {
20	var zig_lib_directory = introspect.findZigLibDir(allocator) catch \|err\| {	20	var zig_lib_directory = introspect.findZigLibDir(allocator) catch \|err\| {
21	fatal("unable to find zig installation directory: {}\n", .{@errorName(err)});	21	fatal("unable to find zig installation directory: {s}\n", .{@errorName(err)});
22	};	22	};
23	defer zig_lib_directory.handle.close();	23	defer zig_lib_directory.handle.close();
24	defer allocator.free(zig_lib_directory.path.?);	24	defer allocator.free(zig_lib_directory.path.?);
...	@@ -61,7 +61,7 @@ pub fn cmdTargets(	...	@@ -61,7 +61,7 @@ pub fn cmdTargets(
61	try jws.objectField("libc");	61	try jws.objectField("libc");
62	try jws.beginArray();	62	try jws.beginArray();
63	for (target.available_libcs) \|libc\| {	63	for (target.available_libcs) \|libc\| {
64	const tmp = try std.fmt.allocPrint(allocator, "{}-{}-{}", .{	64	const tmp = try std.fmt.allocPrint(allocator, "{s}-{s}-{s}", .{
65	@tagName(libc.arch), @tagName(libc.os), @tagName(libc.abi),	65	@tagName(libc.arch), @tagName(libc.os), @tagName(libc.abi),
66	});	66	});
67	defer allocator.free(tmp);	67	defer allocator.free(tmp);

src/stage1.zig+2-2

...	@@ -37,14 +37,14 @@ pub export fn main(argc: c_int, argv: [][:0]u8) c_int {	...	@@ -37,14 +37,14 @@ pub export fn main(argc: c_int, argv: [][:0]u8) c_int {
37	defer arena_instance.deinit();	37	defer arena_instance.deinit();
38	const arena = &arena_instance.allocator;	38	const arena = &arena_instance.allocator;
39		39
40	const args = arena.alloc([]const u8, @intCast(usize, argc)) catch fatal("{}", .{"OutOfMemory"});	40	const args = arena.alloc([]const u8, @intCast(usize, argc)) catch fatal("{s}", .{"OutOfMemory"});
41	for (args) \|*arg, i\| {	41	for (args) \|*arg, i\| {
42	arg.* = mem.spanZ(argv[i]);	42	arg.* = mem.spanZ(argv[i]);
43	}	43	}
44	if (std.builtin.mode == .Debug) {	44	if (std.builtin.mode == .Debug) {
45	stage2.mainArgs(gpa, arena, args) catch unreachable;	45	stage2.mainArgs(gpa, arena, args) catch unreachable;
46	} else {	46	} else {
47	stage2.mainArgs(gpa, arena, args) catch \|err\| fatal("{}", .{@errorName(err)});	47	stage2.mainArgs(gpa, arena, args) catch \|err\| fatal("{s}", .{@errorName(err)});
48	}	48	}
49	return 0;	49	return 0;
50	}	50	}

src/translate_c.zig+38-38

src/value.zig+2-2

...	@@ -464,7 +464,7 @@ pub const Value = extern union {	...	@@ -464,7 +464,7 @@ pub const Value = extern union {
464	.ty => return val.castTag(.ty).?.data.format("", options, out_stream),	464	.ty => return val.castTag(.ty).?.data.format("", options, out_stream),
465	.int_type => {	465	.int_type => {
466	const int_type = val.castTag(.int_type).?.data;	466	const int_type = val.castTag(.int_type).?.data;
467	return out_stream.print("{}{}", .{	467	return out_stream.print("{s}{d}", .{
468	if (int_type.signed) "s" else "u",	468	if (int_type.signed) "s" else "u",
469	int_type.bits,	469	int_type.bits,
470	});	470	});
...	@@ -507,7 +507,7 @@ pub const Value = extern union {	...	@@ -507,7 +507,7 @@ pub const Value = extern union {
507	}	507	}
508	return out_stream.writeAll("}");	508	return out_stream.writeAll("}");
509	},	509	},
510	.@"error" => return out_stream.print("error.{}", .{val.castTag(.@"error").?.data.name}),	510	.@"error" => return out_stream.print("error.{s}", .{val.castTag(.@"error").?.data.name}),
511	.inferred_alloc => return out_stream.writeAll("(inferred allocation value)"),	511	.inferred_alloc => return out_stream.writeAll("(inferred allocation value)"),
512	};	512	};
513	}	513	}

src/zir.zig+22-22

src/zir_sema.zig+17-17

...	@@ -953,7 +953,7 @@ pub fn ensureDeclAnalyzed(self: Module, decl: Decl) InnerError!void {	...	@@ -953,7 +953,7 @@ pub fn ensureDeclAnalyzed(self: Module, decl: Decl) InnerError!void {
953	self.failed_decls.putAssumeCapacityNoClobber(decl, try Compilation.ErrorMsg.create(	953	self.failed_decls.putAssumeCapacityNoClobber(decl, try Compilation.ErrorMsg.create(
954	self.gpa,	954	self.gpa,
955	decl.src(),	955	decl.src(),
956	"unable to analyze: {}",	956	"unable to analyze: {s}",
957	.{@errorName(err)},	957	.{@errorName(err)},
958	));	958	));
959	decl.analysis = .sema_failure_retryable;	959	decl.analysis = .sema_failure_retryable;
...	@@ -1475,7 +1475,7 @@ fn getSrcModule(self: Module, root_scope: Scope.ZIRModule) !*zir.Module {	...	@@ -1475,7 +1475,7 @@ fn getSrcModule(self: Module, root_scope: Scope.ZIRModule) !*zir.Module {
1475	if (zir_module.error_msg) \|src_err_msg\| {	1475	if (zir_module.error_msg) \|src_err_msg\| {
1476	self.failed_files.putAssumeCapacityNoClobber(	1476	self.failed_files.putAssumeCapacityNoClobber(
1477	&root_scope.base,	1477	&root_scope.base,
1478	try Compilation.ErrorMsg.create(self.gpa, src_err_msg.byte_offset, "{}", .{src_err_msg.msg}),	1478	try Compilation.ErrorMsg.create(self.gpa, src_err_msg.byte_offset, "{s}", .{src_err_msg.msg}),
1479	);	1479	);
1480	root_scope.status = .unloaded_parse_failure;	1480	root_scope.status = .unloaded_parse_failure;
1481	return error.AnalysisFail;	1481	return error.AnalysisFail;
...	@@ -1581,7 +1581,7 @@ pub fn analyzeContainer(self: Module, container_scope: Scope.Container) !void	...	@@ -1581,7 +1581,7 @@ pub fn analyzeContainer(self: Module, container_scope: Scope.Container) !void
1581	decl.src_index = decl_i;	1581	decl.src_index = decl_i;
1582	if (deleted_decls.remove(decl) == null) {	1582	if (deleted_decls.remove(decl) == null) {
1583	decl.analysis = .sema_failure;	1583	decl.analysis = .sema_failure;
1584	const err_msg = try Compilation.ErrorMsg.create(self.gpa, tree.token_locs[name_tok].start, "redefinition of '{}'", .{decl.name});	1584	const err_msg = try Compilation.ErrorMsg.create(self.gpa, tree.token_locs[name_tok].start, "redefinition of '{s}'", .{decl.name});
1585	errdefer err_msg.destroy(self.gpa);	1585	errdefer err_msg.destroy(self.gpa);
1586	try self.failed_decls.putNoClobber(self.gpa, decl, err_msg);	1586	try self.failed_decls.putNoClobber(self.gpa, decl, err_msg);
1587	} else {	1587	} else {
...	@@ -1623,7 +1623,7 @@ pub fn analyzeContainer(self: Module, container_scope: Scope.Container) !void	...	@@ -1623,7 +1623,7 @@ pub fn analyzeContainer(self: Module, container_scope: Scope.Container) !void
1623	decl.src_index = decl_i;	1623	decl.src_index = decl_i;
1624	if (deleted_decls.remove(decl) == null) {	1624	if (deleted_decls.remove(decl) == null) {
1625	decl.analysis = .sema_failure;	1625	decl.analysis = .sema_failure;
1626	const err_msg = try Compilation.ErrorMsg.create(self.gpa, name_loc.start, "redefinition of '{}'", .{decl.name});	1626	const err_msg = try Compilation.ErrorMsg.create(self.gpa, name_loc.start, "redefinition of '{s}'", .{decl.name});
1627	errdefer err_msg.destroy(self.gpa);	1627	errdefer err_msg.destroy(self.gpa);
1628	try self.failed_decls.putNoClobber(self.gpa, decl, err_msg);	1628	try self.failed_decls.putNoClobber(self.gpa, decl, err_msg);
1629	} else if (!srcHashEql(decl.contents_hash, contents_hash)) {	1629	} else if (!srcHashEql(decl.contents_hash, contents_hash)) {
...	@@ -1991,7 +1991,7 @@ pub fn analyzeExport(	...	@@ -1991,7 +1991,7 @@ pub fn analyzeExport(
1991	self.failed_exports.putAssumeCapacityNoClobber(new_export, try Compilation.ErrorMsg.create(	1991	self.failed_exports.putAssumeCapacityNoClobber(new_export, try Compilation.ErrorMsg.create(
1992	self.gpa,	1992	self.gpa,
1993	src,	1993	src,
1994	"exported symbol collision: {}",	1994	"exported symbol collision: {s}",
1995	.{symbol_name},	1995	.{symbol_name},
1996	));	1996	));
1997	// TODO: add a note	1997	// TODO: add a note
...	@@ -2007,7 +2007,7 @@ pub fn analyzeExport(	...	@@ -2007,7 +2007,7 @@ pub fn analyzeExport(
2007	self.failed_exports.putAssumeCapacityNoClobber(new_export, try Compilation.ErrorMsg.create(	2007	self.failed_exports.putAssumeCapacityNoClobber(new_export, try Compilation.ErrorMsg.create(
2008	self.gpa,	2008	self.gpa,
2009	src,	2009	src,
2010	"unable to export: {}",	2010	"unable to export: {s}",
2011	.{@errorName(err)},	2011	.{@errorName(err)},
2012	));	2012	));
2013	new_export.status = .failed_retryable;	2013	new_export.status = .failed_retryable;
...	@@ -2277,7 +2277,7 @@ pub fn createAnonymousDecl(	...	@@ -2277,7 +2277,7 @@ pub fn createAnonymousDecl(
2277	) !*Decl {	2277	) !*Decl {
2278	const name_index = self.getNextAnonNameIndex();	2278	const name_index = self.getNextAnonNameIndex();
2279	const scope_decl = scope.decl().?;	2279	const scope_decl = scope.decl().?;
2280	const name = try std.fmt.allocPrint(self.gpa, "{}__anon_{}", .{ scope_decl.name, name_index });	2280	const name = try std.fmt.allocPrint(self.gpa, "{s}__anon_{}", .{ scope_decl.name, name_index });
2281	defer self.gpa.free(name);	2281	defer self.gpa.free(name);
2282	const name_hash = scope.namespace().fullyQualifiedNameHash(name);	2282	const name_hash = scope.namespace().fullyQualifiedNameHash(name);
2283	const src_hash: std.zig.SrcHash = undefined;	2283	const src_hash: std.zig.SrcHash = undefined;
...	@@ -2384,7 +2384,7 @@ pub fn analyzeDeref(self: Module, scope: Scope, src: usize, ptr: *Inst, ptr_sr	...	@@ -2384,7 +2384,7 @@ pub fn analyzeDeref(self: Module, scope: Scope, src: usize, ptr: *Inst, ptr_sr
2384		2384
2385	pub fn analyzeDeclRefByName(self: Module, scope: Scope, src: usize, decl_name: []const u8) InnerError!*Inst {	2385	pub fn analyzeDeclRefByName(self: Module, scope: Scope, src: usize, decl_name: []const u8) InnerError!*Inst {
2386	const decl = self.lookupDeclName(scope, decl_name) orelse	2386	const decl = self.lookupDeclName(scope, decl_name) orelse
2387	return self.fail(scope, src, "decl '{}' not found", .{decl_name});	2387	return self.fail(scope, src, "decl '{s}' not found", .{decl_name});
2388	return self.analyzeDeclRef(scope, src, decl);	2388	return self.analyzeDeclRef(scope, src, decl);
2389	}	2389	}
2390		2390

...	@@ -1955,7 +1955,7 @@ fn identifier(mod: Module, scope: Scope, rl: ResultLoc, ident: *ast.Node.OneTo	...	@@ -1955,7 +1955,7 @@ fn identifier(mod: Module, scope: Scope, rl: ResultLoc, ident: *ast.Node.OneTo
1955	error.Overflow => return mod.failNode(	1955	error.Overflow => return mod.failNode(
1956	scope,	1956	scope,
1957	&ident.base,	1957	&ident.base,
1958	"primitive integer type '{}' exceeds maximum bit width of 65535",	1958	"primitive integer type '{s}' exceeds maximum bit width of 65535",
1959	.{ident_name},	1959	.{ident_name},
1960	),	1960	),
1961	error.InvalidCharacter => break :integer,	1961	error.InvalidCharacter => break :integer,
...	@@ -2010,7 +2010,7 @@ fn identifier(mod: Module, scope: Scope, rl: ResultLoc, ident: *ast.Node.OneTo	...	@@ -2010,7 +2010,7 @@ fn identifier(mod: Module, scope: Scope, rl: ResultLoc, ident: *ast.Node.OneTo
2010	return rlWrapPtr(mod, scope, rl, try addZIRInst(mod, scope, src, zir.Inst.DeclValInModule, .{ .decl = decl }, .{}));	2010	return rlWrapPtr(mod, scope, rl, try addZIRInst(mod, scope, src, zir.Inst.DeclValInModule, .{ .decl = decl }, .{}));
2011	}	2011	}
2012		2012
2013	return mod.failNode(scope, &ident.base, "use of undeclared identifier '{}'", .{ident_name});	2013	return mod.failNode(scope, &ident.base, "use of undeclared identifier '{s}'", .{ident_name});
2014	}	2014	}
2015		2015
2016	fn stringLiteral(mod: Module, scope: Scope, str_lit: ast.Node.OneToken) InnerError!zir.Inst {	2016	fn stringLiteral(mod: Module, scope: Scope, str_lit: ast.Node.OneToken) InnerError!zir.Inst {
...	@@ -2204,7 +2204,7 @@ fn ensureBuiltinParamCount(mod: Module, scope: Scope, call: *ast.Node.BuiltinC	...	@@ -2204,7 +2204,7 @@ fn ensureBuiltinParamCount(mod: Module, scope: Scope, call: *ast.Node.BuiltinC
2204	return;	2204	return;
2205		2205
2206	const s = if (count == 1) "" else "s";	2206	const s = if (count == 1) "" else "s";
2207	return mod.failTok(scope, call.builtin_token, "expected {} parameter{}, found {}", .{ count, s, call.params_len });	2207	return mod.failTok(scope, call.builtin_token, "expected {} parameter{s}, found {}", .{ count, s, call.params_len });
2208	}	2208	}
2209		2209
2210	fn simpleCast(	2210	fn simpleCast(
...	@@ -2383,7 +2383,7 @@ fn builtinCall(mod: Module, scope: Scope, rl: ResultLoc, call: *ast.Node.Built	...	@@ -2383,7 +2383,7 @@ fn builtinCall(mod: Module, scope: Scope, rl: ResultLoc, call: *ast.Node.Built
2383	} else if (mem.eql(u8, builtin_name, "@compileError")) {	2383	} else if (mem.eql(u8, builtin_name, "@compileError")) {
2384	return compileError(mod, scope, call);	2384	return compileError(mod, scope, call);
2385	} else {	2385	} else {
2386	return mod.failTok(scope, call.builtin_token, "invalid builtin function: '{}'", .{builtin_name});	2386	return mod.failTok(scope, call.builtin_token, "invalid builtin function: '{s}'", .{builtin_name});
2387	}	2387	}
2388	}	2388	}
2389		2389

...	@@ -228,7 +228,7 @@ pub fn generateSymbol(	...	@@ -228,7 +228,7 @@ pub fn generateSymbol(
228	.fail = try ErrorMsg.create(	228	.fail = try ErrorMsg.create(
229	bin_file.allocator,	229	bin_file.allocator,
230	src,	230	src,
231	"TODO implement generateSymbol for type '{}'",	231	"TODO implement generateSymbol for type '{s}'",
232	.{@tagName(t)},	232	.{@tagName(t)},
233	),	233	),
234	};	234	};
...	@@ -2029,7 +2029,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2029,7 +2029,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2029	});	2029	});
2030	break :blk 0x84;	2030	break :blk 0x84;
2031	},	2031	},
2032	else => return self.fail(inst.base.src, "TODO implement condbr {} when condition is {}", .{ self.target.cpu.arch, @tagName(cond) }),	2032	else => return self.fail(inst.base.src, "TODO implement condbr {s} when condition is {s}", .{ self.target.cpu.arch, @tagName(cond) }),
2033	};	2033	};
2034	self.code.appendSliceAssumeCapacity(&[_]u8{ 0x0f, opcode });	2034	self.code.appendSliceAssumeCapacity(&[_]u8{ 0x0f, opcode });
2035	const reloc = Reloc{ .rel32 = self.code.items.len };	2035	const reloc = Reloc{ .rel32 = self.code.items.len };
...	@@ -2376,11 +2376,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2376,11 +2376,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2376	.arm, .armeb => {	2376	.arm, .armeb => {
2377	for (inst.inputs) \|input, i\| {	2377	for (inst.inputs) \|input, i\| {
2378	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {	2378	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {
2379	return self.fail(inst.base.src, "unrecognized asm input constraint: '{}'", .{input});	2379	return self.fail(inst.base.src, "unrecognized asm input constraint: '{s}'", .{input});
2380	}	2380	}
2381	const reg_name = input[1 .. input.len - 1];	2381	const reg_name = input[1 .. input.len - 1];
2382	const reg = parseRegName(reg_name) orelse	2382	const reg = parseRegName(reg_name) orelse
2383	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2383	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2384	const arg = try self.resolveInst(inst.args[i]);	2384	const arg = try self.resolveInst(inst.args[i]);
2385	try self.genSetReg(inst.base.src, reg, arg);	2385	try self.genSetReg(inst.base.src, reg, arg);
2386	}	2386	}
...	@@ -2393,11 +2393,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2393,11 +2393,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2393		2393
2394	if (inst.output) \|output\| {	2394	if (inst.output) \|output\| {
2395	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {	2395	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {
2396	return self.fail(inst.base.src, "unrecognized asm output constraint: '{}'", .{output});	2396	return self.fail(inst.base.src, "unrecognized asm output constraint: '{s}'", .{output});
2397	}	2397	}
2398	const reg_name = output[2 .. output.len - 1];	2398	const reg_name = output[2 .. output.len - 1];
2399	const reg = parseRegName(reg_name) orelse	2399	const reg = parseRegName(reg_name) orelse
2400	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2400	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2401	return MCValue{ .register = reg };	2401	return MCValue{ .register = reg };
2402	} else {	2402	} else {
2403	return MCValue.none;	2403	return MCValue.none;
...	@@ -2406,11 +2406,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2406,11 +2406,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2406	.aarch64 => {	2406	.aarch64 => {
2407	for (inst.inputs) \|input, i\| {	2407	for (inst.inputs) \|input, i\| {
2408	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {	2408	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {
2409	return self.fail(inst.base.src, "unrecognized asm input constraint: '{}'", .{input});	2409	return self.fail(inst.base.src, "unrecognized asm input constraint: '{s}'", .{input});
2410	}	2410	}
2411	const reg_name = input[1 .. input.len - 1];	2411	const reg_name = input[1 .. input.len - 1];
2412	const reg = parseRegName(reg_name) orelse	2412	const reg = parseRegName(reg_name) orelse
2413	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2413	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2414	const arg = try self.resolveInst(inst.args[i]);	2414	const arg = try self.resolveInst(inst.args[i]);
2415	try self.genSetReg(inst.base.src, reg, arg);	2415	try self.genSetReg(inst.base.src, reg, arg);
2416	}	2416	}
...	@@ -2425,11 +2425,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2425,11 +2425,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2425		2425
2426	if (inst.output) \|output\| {	2426	if (inst.output) \|output\| {
2427	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {	2427	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {
2428	return self.fail(inst.base.src, "unrecognized asm output constraint: '{}'", .{output});	2428	return self.fail(inst.base.src, "unrecognized asm output constraint: '{s}'", .{output});
2429	}	2429	}
2430	const reg_name = output[2 .. output.len - 1];	2430	const reg_name = output[2 .. output.len - 1];
2431	const reg = parseRegName(reg_name) orelse	2431	const reg = parseRegName(reg_name) orelse
2432	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2432	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2433	return MCValue{ .register = reg };	2433	return MCValue{ .register = reg };
2434	} else {	2434	} else {
2435	return MCValue.none;	2435	return MCValue.none;
...	@@ -2438,11 +2438,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2438,11 +2438,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2438	.riscv64 => {	2438	.riscv64 => {
2439	for (inst.inputs) \|input, i\| {	2439	for (inst.inputs) \|input, i\| {
2440	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {	2440	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {
2441	return self.fail(inst.base.src, "unrecognized asm input constraint: '{}'", .{input});	2441	return self.fail(inst.base.src, "unrecognized asm input constraint: '{s}'", .{input});
2442	}	2442	}
2443	const reg_name = input[1 .. input.len - 1];	2443	const reg_name = input[1 .. input.len - 1];
2444	const reg = parseRegName(reg_name) orelse	2444	const reg = parseRegName(reg_name) orelse
2445	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2445	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2446	const arg = try self.resolveInst(inst.args[i]);	2446	const arg = try self.resolveInst(inst.args[i]);
2447	try self.genSetReg(inst.base.src, reg, arg);	2447	try self.genSetReg(inst.base.src, reg, arg);
2448	}	2448	}
...	@@ -2455,11 +2455,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2455,11 +2455,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2455		2455
2456	if (inst.output) \|output\| {	2456	if (inst.output) \|output\| {
2457	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {	2457	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {
2458	return self.fail(inst.base.src, "unrecognized asm output constraint: '{}'", .{output});	2458	return self.fail(inst.base.src, "unrecognized asm output constraint: '{s}'", .{output});
2459	}	2459	}
2460	const reg_name = output[2 .. output.len - 1];	2460	const reg_name = output[2 .. output.len - 1];
2461	const reg = parseRegName(reg_name) orelse	2461	const reg = parseRegName(reg_name) orelse
2462	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2462	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2463	return MCValue{ .register = reg };	2463	return MCValue{ .register = reg };
2464	} else {	2464	} else {
2465	return MCValue.none;	2465	return MCValue.none;
...	@@ -2468,11 +2468,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2468,11 +2468,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2468	.x86_64, .i386 => {	2468	.x86_64, .i386 => {
2469	for (inst.inputs) \|input, i\| {	2469	for (inst.inputs) \|input, i\| {
2470	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {	2470	if (input.len < 3 or input[0] != '{' or input[input.len - 1] != '}') {
2471	return self.fail(inst.base.src, "unrecognized asm input constraint: '{}'", .{input});	2471	return self.fail(inst.base.src, "unrecognized asm input constraint: '{s}'", .{input});
2472	}	2472	}
2473	const reg_name = input[1 .. input.len - 1];	2473	const reg_name = input[1 .. input.len - 1];
2474	const reg = parseRegName(reg_name) orelse	2474	const reg = parseRegName(reg_name) orelse
2475	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2475	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2476	const arg = try self.resolveInst(inst.args[i]);	2476	const arg = try self.resolveInst(inst.args[i]);
2477	try self.genSetReg(inst.base.src, reg, arg);	2477	try self.genSetReg(inst.base.src, reg, arg);
2478	}	2478	}
...	@@ -2485,11 +2485,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -2485,11 +2485,11 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
2485		2485
2486	if (inst.output) \|output\| {	2486	if (inst.output) \|output\| {
2487	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {	2487	if (output.len < 4 or output[0] != '=' or output[1] != '{' or output[output.len - 1] != '}') {
2488	return self.fail(inst.base.src, "unrecognized asm output constraint: '{}'", .{output});	2488	return self.fail(inst.base.src, "unrecognized asm output constraint: '{s}'", .{output});
2489	}	2489	}
2490	const reg_name = output[2 .. output.len - 1];	2490	const reg_name = output[2 .. output.len - 1];
2491	const reg = parseRegName(reg_name) orelse	2491	const reg = parseRegName(reg_name) orelse
2492	return self.fail(inst.base.src, "unrecognized register: '{}'", .{reg_name});	2492	return self.fail(inst.base.src, "unrecognized register: '{s}'", .{reg_name});
2493	return MCValue{ .register = reg };	2493	return MCValue{ .register = reg };
2494	} else {	2494	} else {
2495	return MCValue.none;	2495	return MCValue.none;
...	@@ -3417,7 +3417,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {	...	@@ -3417,7 +3417,7 @@ fn Function(comptime arch: std.Target.Cpu.Arch) type {
3417	next_int_reg += 1;	3417	next_int_reg += 1;
3418	}	3418	}
3419	},	3419	},
3420	else => return self.fail(src, "TODO implement function parameters of type {}", .{@tagName(ty.zigTypeTag())}),	3420	else => return self.fail(src, "TODO implement function parameters of type {s}", .{@tagName(ty.zigTypeTag())}),
3421	}	3421	}
3422	}	3422	}
3423	result.stack_byte_count = next_stack_offset;	3423	result.stack_byte_count = next_stack_offset;

...	@@ -72,7 +72,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -72,7 +72,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
72	errdefer version_table.deinit(gpa);	72	errdefer version_table.deinit(gpa);
73		73
74	var glibc_dir = zig_lib_dir.openDir("libc" ++ path.sep_str ++ "glibc", .{}) catch \|err\| {	74	var glibc_dir = zig_lib_dir.openDir("libc" ++ path.sep_str ++ "glibc", .{}) catch \|err\| {
75	std.log.err("unable to open glibc dir: {}", .{@errorName(err)});	75	std.log.err("unable to open glibc dir: {s}", .{@errorName(err)});
76	return error.ZigInstallationCorrupt;	76	return error.ZigInstallationCorrupt;
77	};	77	};
78	defer glibc_dir.close();	78	defer glibc_dir.close();
...	@@ -81,7 +81,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -81,7 +81,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
81	const vers_txt_contents = glibc_dir.readFileAlloc(gpa, "vers.txt", max_txt_size) catch \|err\| switch (err) {	81	const vers_txt_contents = glibc_dir.readFileAlloc(gpa, "vers.txt", max_txt_size) catch \|err\| switch (err) {
82	error.OutOfMemory => return error.OutOfMemory,	82	error.OutOfMemory => return error.OutOfMemory,
83	else => {	83	else => {
84	std.log.err("unable to read vers.txt: {}", .{@errorName(err)});	84	std.log.err("unable to read vers.txt: {s}", .{@errorName(err)});
85	return error.ZigInstallationCorrupt;	85	return error.ZigInstallationCorrupt;
86	},	86	},
87	};	87	};
...	@@ -91,7 +91,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -91,7 +91,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
91	const fns_txt_contents = glibc_dir.readFileAlloc(arena, "fns.txt", max_txt_size) catch \|err\| switch (err) {	91	const fns_txt_contents = glibc_dir.readFileAlloc(arena, "fns.txt", max_txt_size) catch \|err\| switch (err) {
92	error.OutOfMemory => return error.OutOfMemory,	92	error.OutOfMemory => return error.OutOfMemory,
93	else => {	93	else => {
94	std.log.err("unable to read fns.txt: {}", .{@errorName(err)});	94	std.log.err("unable to read fns.txt: {s}", .{@errorName(err)});
95	return error.ZigInstallationCorrupt;	95	return error.ZigInstallationCorrupt;
96	},	96	},
97	};	97	};
...	@@ -99,7 +99,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -99,7 +99,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
99	const abi_txt_contents = glibc_dir.readFileAlloc(gpa, "abi.txt", max_txt_size) catch \|err\| switch (err) {	99	const abi_txt_contents = glibc_dir.readFileAlloc(gpa, "abi.txt", max_txt_size) catch \|err\| switch (err) {
100	error.OutOfMemory => return error.OutOfMemory,	100	error.OutOfMemory => return error.OutOfMemory,
101	else => {	101	else => {
102	std.log.err("unable to read abi.txt: {}", .{@errorName(err)});	102	std.log.err("unable to read abi.txt: {s}", .{@errorName(err)});
103	return error.ZigInstallationCorrupt;	103	return error.ZigInstallationCorrupt;
104	},	104	},
105	};	105	};
...	@@ -116,7 +116,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -116,7 +116,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
116	}	116	}
117	const adjusted_line = line[prefix.len..];	117	const adjusted_line = line[prefix.len..];
118	const ver = std.builtin.Version.parse(adjusted_line) catch \|err\| {	118	const ver = std.builtin.Version.parse(adjusted_line) catch \|err\| {
119	std.log.err("vers.txt:{}: unable to parse glibc version '{}': {}", .{ line_i, line, @errorName(err) });	119	std.log.err("vers.txt:{}: unable to parse glibc version '{s}': {s}", .{ line_i, line, @errorName(err) });
120	return error.ZigInstallationCorrupt;	120	return error.ZigInstallationCorrupt;
121	};	121	};
122	try all_versions.append(arena, ver);	122	try all_versions.append(arena, ver);
...	@@ -136,7 +136,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -136,7 +136,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
136	return error.ZigInstallationCorrupt;	136	return error.ZigInstallationCorrupt;
137	};	137	};
138	const lib = findLib(lib_name) orelse {	138	const lib = findLib(lib_name) orelse {
139	std.log.err("fns.txt:{}: unknown library name: {}", .{ line_i, lib_name });	139	std.log.err("fns.txt:{}: unknown library name: {s}", .{ line_i, lib_name });
140	return error.ZigInstallationCorrupt;	140	return error.ZigInstallationCorrupt;
141	};	141	};
142	try all_functions.append(arena, .{	142	try all_functions.append(arena, .{
...	@@ -170,15 +170,15 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -170,15 +170,15 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
170	return error.ZigInstallationCorrupt;	170	return error.ZigInstallationCorrupt;
171	};	171	};
172	const arch_tag = std.meta.stringToEnum(std.Target.Cpu.Arch, arch_name) orelse {	172	const arch_tag = std.meta.stringToEnum(std.Target.Cpu.Arch, arch_name) orelse {
173	std.log.err("abi.txt:{}: unrecognized arch: '{}'", .{ line_i, arch_name });	173	std.log.err("abi.txt:{}: unrecognized arch: '{s}'", .{ line_i, arch_name });
174	return error.ZigInstallationCorrupt;	174	return error.ZigInstallationCorrupt;
175	};	175	};
176	if (!mem.eql(u8, os_name, "linux")) {	176	if (!mem.eql(u8, os_name, "linux")) {
177	std.log.err("abi.txt:{}: expected OS 'linux', found '{}'", .{ line_i, os_name });	177	std.log.err("abi.txt:{}: expected OS 'linux', found '{s}'", .{ line_i, os_name });
178	return error.ZigInstallationCorrupt;	178	return error.ZigInstallationCorrupt;
179	}	179	}
180	const abi_tag = std.meta.stringToEnum(std.Target.Abi, abi_name) orelse {	180	const abi_tag = std.meta.stringToEnum(std.Target.Abi, abi_name) orelse {
181	std.log.err("abi.txt:{}: unrecognized ABI: '{}'", .{ line_i, abi_name });	181	std.log.err("abi.txt:{}: unrecognized ABI: '{s}'", .{ line_i, abi_name });
182	return error.ZigInstallationCorrupt;	182	return error.ZigInstallationCorrupt;
183	};	183	};
184		184
...	@@ -211,7 +211,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!	...	@@ -211,7 +211,7 @@ pub fn loadMetaData(gpa: *Allocator, zig_lib_dir: std.fs.Dir) LoadMetaDataError!
211	}	211	}
212	const version_index = std.fmt.parseInt(u8, version_index_string, 10) catch \|err\| {	212	const version_index = std.fmt.parseInt(u8, version_index_string, 10) catch \|err\| {
213	// If this happens with legit data, increase the size of the integer type in the struct.	213	// If this happens with legit data, increase the size of the integer type in the struct.
214	std.log.err("abi.txt:{}: unable to parse version: {}", .{ line_i, @errorName(err) });	214	std.log.err("abi.txt:{}: unable to parse version: {s}", .{ line_i, @errorName(err) });
215	return error.ZigInstallationCorrupt;	215	return error.ZigInstallationCorrupt;
216	};	216	};
217		217
...	@@ -531,7 +531,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: *std.ArrayList(	...	@@ -531,7 +531,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: *std.ArrayList(
531	try args.append(try path.join(arena, &[_][]const u8{ comp.zig_lib_directory.path.?, lib_libc ++ "glibc" }));	531	try args.append(try path.join(arena, &[_][]const u8{ comp.zig_lib_directory.path.?, lib_libc ++ "glibc" }));
532		532
533	try args.append("-I");	533	try args.append("-I");
534	try args.append(try std.fmt.allocPrint(arena, "{}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{}-{}-{}", .{	534	try args.append(try std.fmt.allocPrint(arena, "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-{s}-{s}", .{
535	comp.zig_lib_directory.path.?, @tagName(arch), @tagName(target.os.tag), @tagName(target.abi),	535	comp.zig_lib_directory.path.?, @tagName(arch), @tagName(target.os.tag), @tagName(target.abi),
536	}));	536	}));
537		537
...	@@ -539,7 +539,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: *std.ArrayList(	...	@@ -539,7 +539,7 @@ fn add_include_dirs(comp: Compilation, arena: Allocator, args: *std.ArrayList(
539	try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "generic-glibc"));	539	try args.append(try lib_path(comp, arena, lib_libc ++ "include" ++ s ++ "generic-glibc"));
540		540
541	try args.append("-I");	541	try args.append("-I");
542	try args.append(try std.fmt.allocPrint(arena, "{}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{}-linux-any", .{	542	try args.append(try std.fmt.allocPrint(arena, "{s}" ++ s ++ "libc" ++ s ++ "include" ++ s ++ "{s}-linux-any", .{
543	comp.zig_lib_directory.path.?, @tagName(arch),	543	comp.zig_lib_directory.path.?, @tagName(arch),
544	}));	544	}));
545		545
...	@@ -881,7 +881,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void {	...	@@ -881,7 +881,7 @@ pub fn buildSharedObjects(comp: *Compilation) !void {
881	if (o_directory.handle.createFile(ok_basename, .{})) \|file\| {	881	if (o_directory.handle.createFile(ok_basename, .{})) \|file\| {
882	file.close();	882	file.close();
883	} else \|err\| {	883	} else \|err\| {
884	std.log.warn("glibc shared objects: failed to mark completion: {}", .{@errorName(err)});	884	std.log.warn("glibc shared objects: failed to mark completion: {s}", .{@errorName(err)});
885	}	885	}
886	}	886	}
887		887

...	@@ -686,7 +686,7 @@ pub fn updateDecl(self: Coff, module: Module, decl: *Module.Decl) !void {	...	@@ -686,7 +686,7 @@ pub fn updateDecl(self: Coff, module: Module, decl: *Module.Decl) !void {
686	if (need_realloc) {	686	if (need_realloc) {
687	const curr_vaddr = self.getDeclVAddr(decl);	687	const curr_vaddr = self.getDeclVAddr(decl);
688	const vaddr = try self.growTextBlock(&decl.link.coff, code.len, required_alignment);	688	const vaddr = try self.growTextBlock(&decl.link.coff, code.len, required_alignment);
689	log.debug("growing {} from 0x{x} to 0x{x}\n", .{ decl.name, curr_vaddr, vaddr });	689	log.debug("growing {s} from 0x{x} to 0x{x}\n", .{ decl.name, curr_vaddr, vaddr });
690	if (vaddr != curr_vaddr) {	690	if (vaddr != curr_vaddr) {
691	log.debug(" (writing new offset table entry)\n", .{});	691	log.debug(" (writing new offset table entry)\n", .{});
692	self.offset_table.items[decl.link.coff.offset_table_index] = vaddr;	692	self.offset_table.items[decl.link.coff.offset_table_index] = vaddr;
...	@@ -697,7 +697,7 @@ pub fn updateDecl(self: Coff, module: Module, decl: *Module.Decl) !void {	...	@@ -697,7 +697,7 @@ pub fn updateDecl(self: Coff, module: Module, decl: *Module.Decl) !void {
697	}	697	}
698	} else {	698	} else {
699	const vaddr = try self.allocateTextBlock(&decl.link.coff, code.len, required_alignment);	699	const vaddr = try self.allocateTextBlock(&decl.link.coff, code.len, required_alignment);
700	log.debug("allocated text block for {} at 0x{x} (size: {Bi})\n", .{ mem.spanZ(decl.name), vaddr, code.len });	700	log.debug("allocated text block for {s} at 0x{x} (size: {Bi})\n", .{ mem.spanZ(decl.name), vaddr, code.len });
701	errdefer self.freeTextBlock(&decl.link.coff);	701	errdefer self.freeTextBlock(&decl.link.coff);
702	self.offset_table.items[decl.link.coff.offset_table_index] = vaddr;	702	self.offset_table.items[decl.link.coff.offset_table_index] = vaddr;
703	try self.writeOffsetTableEntry(decl.link.coff.offset_table_index);	703	try self.writeOffsetTableEntry(decl.link.coff.offset_table_index);
...	@@ -880,7 +880,7 @@ fn linkWithLLD(self: Coff, comp: Compilation) !void {	...	@@ -880,7 +880,7 @@ fn linkWithLLD(self: Coff, comp: Compilation) !void {
880	id_symlink_basename,	880	id_symlink_basename,
881	&prev_digest_buf,	881	&prev_digest_buf,
882	) catch \|err\| blk: {	882	) catch \|err\| blk: {
883	log.debug("COFF LLD new_digest={} error: {}", .{ digest, @errorName(err) });	883	log.debug("COFF LLD new_digest={} error: {s}", .{ digest, @errorName(err) });
884	// Handle this as a cache miss.	884	// Handle this as a cache miss.
885	break :blk prev_digest_buf[0..0];	885	break :blk prev_digest_buf[0..0];
886	};	886	};
...	@@ -1236,11 +1236,11 @@ fn linkWithLLD(self: Coff, comp: Compilation) !void {	...	@@ -1236,11 +1236,11 @@ fn linkWithLLD(self: Coff, comp: Compilation) !void {
1236	// Update the file with the digest. If it fails we can continue; it only	1236	// Update the file with the digest. If it fails we can continue; it only
1237	// means that the next invocation will have an unnecessary cache miss.	1237	// means that the next invocation will have an unnecessary cache miss.
1238	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {	1238	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {
1239	log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});	1239	log.warn("failed to save linking hash digest file: {s}", .{@errorName(err)});
1240	};	1240	};
1241	// Again failure here only means an unnecessary cache miss.	1241	// Again failure here only means an unnecessary cache miss.
1242	man.writeManifest() catch \|err\| {	1242	man.writeManifest() catch \|err\| {
1243	log.warn("failed to write cache manifest when linking: {}", .{@errorName(err)});	1243	log.warn("failed to write cache manifest when linking: {s}", .{@errorName(err)});
1244	};	1244	};
1245	// We hang on to this lock so that the output file path can be used without	1245	// We hang on to this lock so that the output file path can be used without
1246	// other processes clobbering it.	1246	// other processes clobbering it.

...	@@ -1362,7 +1362,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {	...	@@ -1362,7 +1362,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1362	id_symlink_basename,	1362	id_symlink_basename,
1363	&prev_digest_buf,	1363	&prev_digest_buf,
1364	) catch \|err\| blk: {	1364	) catch \|err\| blk: {
1365	log.debug("ELF LLD new_digest={} error: {}", .{ digest, @errorName(err) });	1365	log.debug("ELF LLD new_digest={} error: {s}", .{ digest, @errorName(err) });
1366	// Handle this as a cache miss.	1366	// Handle this as a cache miss.
1367	break :blk prev_digest_buf[0..0];	1367	break :blk prev_digest_buf[0..0];
1368	};	1368	};
...	@@ -1396,7 +1396,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {	...	@@ -1396,7 +1396,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1396		1396
1397	if (self.base.options.output_mode == .Exe) {	1397	if (self.base.options.output_mode == .Exe) {
1398	try argv.append("-z");	1398	try argv.append("-z");
1399	try argv.append(try std.fmt.allocPrint(arena, "stack-size={}", .{stack_size}));	1399	try argv.append(try std.fmt.allocPrint(arena, "stack-size={d}", .{stack_size}));
1400	}	1400	}
1401		1401
1402	if (self.base.options.image_base_override) \|image_base\| {	1402	if (self.base.options.image_base_override) \|image_base\| {
...	@@ -1438,7 +1438,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {	...	@@ -1438,7 +1438,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1438	if (getLDMOption(target)) \|ldm\| {	1438	if (getLDMOption(target)) \|ldm\| {
1439	// Any target ELF will use the freebsd osabi if suffixed with "_fbsd".	1439	// Any target ELF will use the freebsd osabi if suffixed with "_fbsd".
1440	const arg = if (target.os.tag == .freebsd)	1440	const arg = if (target.os.tag == .freebsd)
1441	try std.fmt.allocPrint(arena, "{}_fbsd", .{ldm})	1441	try std.fmt.allocPrint(arena, "{s}_fbsd", .{ldm})
1442	else	1442	else
1443	ldm;	1443	ldm;
1444	try argv.append("-m");	1444	try argv.append("-m");
...	@@ -1599,7 +1599,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {	...	@@ -1599,7 +1599,7 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1599	// (the check for that needs to be earlier), but they could be full paths to .so files, in which	1599	// (the check for that needs to be earlier), but they could be full paths to .so files, in which
1600	// case we want to avoid prepending "-l".	1600	// case we want to avoid prepending "-l".
1601	const ext = Compilation.classifyFileExt(link_lib);	1601	const ext = Compilation.classifyFileExt(link_lib);
1602	const arg = if (ext == .shared_library) link_lib else try std.fmt.allocPrint(arena, "-l{}", .{link_lib});	1602	const arg = if (ext == .shared_library) link_lib else try std.fmt.allocPrint(arena, "-l{s}", .{link_lib});
1603	argv.appendAssumeCapacity(arg);	1603	argv.appendAssumeCapacity(arg);
1604	}	1604	}
1605		1605
...	@@ -1733,11 +1733,11 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {	...	@@ -1733,11 +1733,11 @@ fn linkWithLLD(self: Elf, comp: Compilation) !void {
1733	// Update the file with the digest. If it fails we can continue; it only	1733	// Update the file with the digest. If it fails we can continue; it only
1734	// means that the next invocation will have an unnecessary cache miss.	1734	// means that the next invocation will have an unnecessary cache miss.
1735	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {	1735	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {
1736	log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});	1736	log.warn("failed to save linking hash digest file: {s}", .{@errorName(err)});
1737	};	1737	};
1738	// Again failure here only means an unnecessary cache miss.	1738	// Again failure here only means an unnecessary cache miss.
1739	man.writeManifest() catch \|err\| {	1739	man.writeManifest() catch \|err\| {
1740	log.warn("failed to write cache manifest when linking: {}", .{@errorName(err)});	1740	log.warn("failed to write cache manifest when linking: {s}", .{@errorName(err)});
1741	};	1741	};
1742	// We hang on to this lock so that the output file path can be used without	1742	// We hang on to this lock so that the output file path can be used without
1743	// other processes clobbering it.	1743	// other processes clobbering it.
...	@@ -2082,10 +2082,10 @@ pub fn allocateDeclIndexes(self: Elf, decl: Module.Decl) !void {	...	@@ -2082,10 +2082,10 @@ pub fn allocateDeclIndexes(self: Elf, decl: Module.Decl) !void {
2082	try self.offset_table.ensureCapacity(self.base.allocator, self.offset_table.items.len + 1);	2082	try self.offset_table.ensureCapacity(self.base.allocator, self.offset_table.items.len + 1);
2083		2083
2084	if (self.local_symbol_free_list.popOrNull()) \|i\| {	2084	if (self.local_symbol_free_list.popOrNull()) \|i\| {
2085	log.debug("reusing symbol index {} for {}\n", .{ i, decl.name });	2085	log.debug("reusing symbol index {} for {s}\n", .{ i, decl.name });
2086	decl.link.elf.local_sym_index = i;	2086	decl.link.elf.local_sym_index = i;
2087	} else {	2087	} else {
2088	log.debug("allocating symbol index {} for {}\n", .{ self.local_symbols.items.len, decl.name });	2088	log.debug("allocating symbol index {} for {s}\n", .{ self.local_symbols.items.len, decl.name });
2089	decl.link.elf.local_sym_index = @intCast(u32, self.local_symbols.items.len);	2089	decl.link.elf.local_sym_index = @intCast(u32, self.local_symbols.items.len);
2090	_ = self.local_symbols.addOneAssumeCapacity();	2090	_ = self.local_symbols.addOneAssumeCapacity();
2091	}	2091	}
...	@@ -2182,7 +2182,7 @@ pub fn updateDecl(self: Elf, module: Module, decl: *Module.Decl) !void {	...	@@ -2182,7 +2182,7 @@ pub fn updateDecl(self: Elf, module: Module, decl: *Module.Decl) !void {
2182	if (zir_dumps.len != 0) {	2182	if (zir_dumps.len != 0) {
2183	for (zir_dumps) \|fn_name\| {	2183	for (zir_dumps) \|fn_name\| {
2184	if (mem.eql(u8, mem.spanZ(decl.name), fn_name)) {	2184	if (mem.eql(u8, mem.spanZ(decl.name), fn_name)) {
2185	std.debug.print("\n{}\n", .{decl.name});	2185	std.debug.print("\n{s}\n", .{decl.name});
2186	typed_value.val.castTag(.function).?.data.dump(module.*);	2186	typed_value.val.castTag(.function).?.data.dump(module.*);
2187	}	2187	}
2188	}	2188	}

...	@@ -520,7 +520,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {	...	@@ -520,7 +520,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {
520	id_symlink_basename,	520	id_symlink_basename,
521	&prev_digest_buf,	521	&prev_digest_buf,
522	) catch \|err\| blk: {	522	) catch \|err\| blk: {
523	log.debug("MachO LLD new_digest={} error: {}", .{ digest, @errorName(err) });	523	log.debug("MachO LLD new_digest={} error: {s}", .{ digest, @errorName(err) });
524	// Handle this as a cache miss.	524	// Handle this as a cache miss.
525	break :blk prev_digest_buf[0..0];	525	break :blk prev_digest_buf[0..0];
526	};	526	};
...	@@ -706,7 +706,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {	...	@@ -706,7 +706,7 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {
706	// (the check for that needs to be earlier), but they could be full paths to .dylib files, in which	706	// (the check for that needs to be earlier), but they could be full paths to .dylib files, in which
707	// case we want to avoid prepending "-l".	707	// case we want to avoid prepending "-l".
708	const ext = Compilation.classifyFileExt(link_lib);	708	const ext = Compilation.classifyFileExt(link_lib);
709	const arg = if (ext == .shared_library) link_lib else try std.fmt.allocPrint(arena, "-l{}", .{link_lib});	709	const arg = if (ext == .shared_library) link_lib else try std.fmt.allocPrint(arena, "-l{s}", .{link_lib});
710	argv.appendAssumeCapacity(arg);	710	argv.appendAssumeCapacity(arg);
711	}	711	}
712		712
...	@@ -759,15 +759,15 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {	...	@@ -759,15 +759,15 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {
759	self.base.allocator.free(result.stderr);	759	self.base.allocator.free(result.stderr);
760	}	760	}
761	if (result.stdout.len != 0) {	761	if (result.stdout.len != 0) {
762	log.warn("unexpected LD stdout: {}", .{result.stdout});	762	log.warn("unexpected LD stdout: {s}", .{result.stdout});
763	}	763	}
764	if (result.stderr.len != 0) {	764	if (result.stderr.len != 0) {
765	log.warn("unexpected LD stderr: {}", .{result.stderr});	765	log.warn("unexpected LD stderr: {s}", .{result.stderr});
766	}	766	}
767	if (result.term != .Exited or result.term.Exited != 0) {	767	if (result.term != .Exited or result.term.Exited != 0) {
768	// TODO parse this output and surface with the Compilation API rather than	768	// TODO parse this output and surface with the Compilation API rather than
769	// directly outputting to stderr here.	769	// directly outputting to stderr here.
770	log.err("{}", .{result.stderr});	770	log.err("{s}", .{result.stderr});
771	return error.LDReportedFailure;	771	return error.LDReportedFailure;
772	}	772	}
773	} else {	773	} else {
...	@@ -980,11 +980,11 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {	...	@@ -980,11 +980,11 @@ fn linkWithLLD(self: MachO, comp: Compilation) !void {
980	// Update the file with the digest. If it fails we can continue; it only	980	// Update the file with the digest. If it fails we can continue; it only
981	// means that the next invocation will have an unnecessary cache miss.	981	// means that the next invocation will have an unnecessary cache miss.
982	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {	982	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {
983	log.warn("failed to save linking hash digest file: {}", .{@errorName(err)});	983	log.warn("failed to save linking hash digest file: {s}", .{@errorName(err)});
984	};	984	};
985	// Again failure here only means an unnecessary cache miss.	985	// Again failure here only means an unnecessary cache miss.
986	man.writeManifest() catch \|err\| {	986	man.writeManifest() catch \|err\| {
987	log.warn("failed to write cache manifest when linking: {}", .{@errorName(err)});	987	log.warn("failed to write cache manifest when linking: {s}", .{@errorName(err)});
988	};	988	};
989	// We hang on to this lock so that the output file path can be used without	989	// We hang on to this lock so that the output file path can be used without
990	// other processes clobbering it.	990	// other processes clobbering it.
...	@@ -1088,10 +1088,10 @@ pub fn allocateDeclIndexes(self: MachO, decl: Module.Decl) !void {	...	@@ -1088,10 +1088,10 @@ pub fn allocateDeclIndexes(self: MachO, decl: Module.Decl) !void {
1088	try self.offset_table.ensureCapacity(self.base.allocator, self.offset_table.items.len + 1);	1088	try self.offset_table.ensureCapacity(self.base.allocator, self.offset_table.items.len + 1);
1089		1089
1090	if (self.local_symbol_free_list.popOrNull()) \|i\| {	1090	if (self.local_symbol_free_list.popOrNull()) \|i\| {
1091	log.debug("reusing symbol index {} for {}", .{ i, decl.name });	1091	log.debug("reusing symbol index {d} for {s}", .{ i, decl.name });
1092	decl.link.macho.local_sym_index = i;	1092	decl.link.macho.local_sym_index = i;
1093	} else {	1093	} else {
1094	log.debug("allocating symbol index {} for {}", .{ self.local_symbols.items.len, decl.name });	1094	log.debug("allocating symbol index {d} for {s}", .{ self.local_symbols.items.len, decl.name });
1095	decl.link.macho.local_sym_index = @intCast(u32, self.local_symbols.items.len);	1095	decl.link.macho.local_sym_index = @intCast(u32, self.local_symbols.items.len);
1096	_ = self.local_symbols.addOneAssumeCapacity();	1096	_ = self.local_symbols.addOneAssumeCapacity();
1097	}	1097	}
...	@@ -1165,7 +1165,7 @@ pub fn updateDecl(self: MachO, module: Module, decl: *Module.Decl) !void {	...	@@ -1165,7 +1165,7 @@ pub fn updateDecl(self: MachO, module: Module, decl: *Module.Decl) !void {
1165	const need_realloc = code.len > capacity or !mem.isAlignedGeneric(u64, symbol.n_value, required_alignment);	1165	const need_realloc = code.len > capacity or !mem.isAlignedGeneric(u64, symbol.n_value, required_alignment);
1166	if (need_realloc) {	1166	if (need_realloc) {
1167	const vaddr = try self.growTextBlock(&decl.link.macho, code.len, required_alignment);	1167	const vaddr = try self.growTextBlock(&decl.link.macho, code.len, required_alignment);
1168	log.debug("growing {} from 0x{x} to 0x{x}", .{ decl.name, symbol.n_value, vaddr });	1168	log.debug("growing {s} from 0x{x} to 0x{x}", .{ decl.name, symbol.n_value, vaddr });
1169	if (vaddr != symbol.n_value) {	1169	if (vaddr != symbol.n_value) {
1170	symbol.n_value = vaddr;	1170	symbol.n_value = vaddr;
1171	log.debug(" (writing new offset table entry)", .{});	1171	log.debug(" (writing new offset table entry)", .{});
...	@@ -1188,7 +1188,7 @@ pub fn updateDecl(self: MachO, module: Module, decl: *Module.Decl) !void {	...	@@ -1188,7 +1188,7 @@ pub fn updateDecl(self: MachO, module: Module, decl: *Module.Decl) !void {
1188	const decl_name = mem.spanZ(decl.name);	1188	const decl_name = mem.spanZ(decl.name);
1189	const name_str_index = try self.makeString(decl_name);	1189	const name_str_index = try self.makeString(decl_name);
1190	const addr = try self.allocateTextBlock(&decl.link.macho, code.len, required_alignment);	1190	const addr = try self.allocateTextBlock(&decl.link.macho, code.len, required_alignment);
1191	log.debug("allocated text block for {} at 0x{x}", .{ decl_name, addr });	1191	log.debug("allocated text block for {s} at 0x{x}", .{ decl_name, addr });
1192	errdefer self.freeTextBlock(&decl.link.macho);	1192	errdefer self.freeTextBlock(&decl.link.macho);
1193		1193
1194	symbol.* = .{	1194	symbol.* = .{

...	@@ -321,7 +321,7 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {	...	@@ -321,7 +321,7 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {
321	id_symlink_basename,	321	id_symlink_basename,
322	&prev_digest_buf,	322	&prev_digest_buf,
323	) catch \|err\| blk: {	323	) catch \|err\| blk: {
324	log.debug("WASM LLD new_digest={} error: {}", .{ digest, @errorName(err) });	324	log.debug("WASM LLD new_digest={} error: {s}", .{ digest, @errorName(err) });
325	// Handle this as a cache miss.	325	// Handle this as a cache miss.
326	break :blk prev_digest_buf[0..0];	326	break :blk prev_digest_buf[0..0];
327	};	327	};
...	@@ -463,11 +463,11 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {	...	@@ -463,11 +463,11 @@ fn linkWithLLD(self: Wasm, comp: Compilation) !void {
463	// Update the file with the digest. If it fails we can continue; it only	463	// Update the file with the digest. If it fails we can continue; it only
464	// means that the next invocation will have an unnecessary cache miss.	464	// means that the next invocation will have an unnecessary cache miss.
465	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {	465	Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch \|err\| {
466	log.warn("failed to save linking hash digest symlink: {}", .{@errorName(err)});	466	log.warn("failed to save linking hash digest symlink: {s}", .{@errorName(err)});
467	};	467	};
468	// Again failure here only means an unnecessary cache miss.	468	// Again failure here only means an unnecessary cache miss.
469	man.writeManifest() catch \|err\| {	469	man.writeManifest() catch \|err\| {
470	log.warn("failed to write cache manifest when linking: {}", .{@errorName(err)});	470	log.warn("failed to write cache manifest when linking: {s}", .{@errorName(err)});
471	};	471	};
472	// We hang on to this lock so that the output file path can be used without	472	// We hang on to this lock so that the output file path can be used without
473	// other processes clobbering it.	473	// other processes clobbering it.

...	@@ -155,21 +155,21 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {	...	@@ -155,21 +155,21 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
155	if (!is_arch_specific) {	155	if (!is_arch_specific) {
156	// Look for an arch specific override.	156	// Look for an arch specific override.
157	override_path.shrinkRetainingCapacity(0);	157	override_path.shrinkRetainingCapacity(0);
158	try override_path.writer().print("{}" ++ s ++ "{}" ++ s ++ "{}.s", .{	158	try override_path.writer().print("{s}" ++ s ++ "{s}" ++ s ++ "{s}.s", .{
159	dirname, arch_name, noextbasename,	159	dirname, arch_name, noextbasename,
160	});	160	});
161	if (source_table.contains(override_path.items))	161	if (source_table.contains(override_path.items))
162	continue;	162	continue;
163		163
164	override_path.shrinkRetainingCapacity(0);	164	override_path.shrinkRetainingCapacity(0);
165	try override_path.writer().print("{}" ++ s ++ "{}" ++ s ++ "{}.S", .{	165	try override_path.writer().print("{s}" ++ s ++ "{s}" ++ s ++ "{s}.S", .{
166	dirname, arch_name, noextbasename,	166	dirname, arch_name, noextbasename,
167	});	167	});
168	if (source_table.contains(override_path.items))	168	if (source_table.contains(override_path.items))
169	continue;	169	continue;
170		170
171	override_path.shrinkRetainingCapacity(0);	171	override_path.shrinkRetainingCapacity(0);
172	try override_path.writer().print("{}" ++ s ++ "{}" ++ s ++ "{}.c", .{	172	try override_path.writer().print("{s}" ++ s ++ "{s}" ++ s ++ "{s}.c", .{
173	dirname, arch_name, noextbasename,	173	dirname, arch_name, noextbasename,
174	});	174	});
175	if (source_table.contains(override_path.items))	175	if (source_table.contains(override_path.items))
...	@@ -322,7 +322,7 @@ fn add_cc_args(	...	@@ -322,7 +322,7 @@ fn add_cc_args(
322	const target = comp.getTarget();	322	const target = comp.getTarget();
323	const arch_name = target_util.archMuslName(target.cpu.arch);	323	const arch_name = target_util.archMuslName(target.cpu.arch);
324	const os_name = @tagName(target.os.tag);	324	const os_name = @tagName(target.os.tag);
325	const triple = try std.fmt.allocPrint(arena, "{}-{}-musl", .{ arch_name, os_name });	325	const triple = try std.fmt.allocPrint(arena, "{s}-{s}-musl", .{ arch_name, os_name });
326	const o_arg = if (want_O3) "-O3" else "-Os";	326	const o_arg = if (want_O3) "-O3" else "-Os";
327		327
328	try args.appendSlice(&[_][]const u8{	328	try args.appendSlice(&[_][]const u8{

...	@@ -1150,7 +1150,7 @@ pub const Module = struct {	...	@@ -1150,7 +1150,7 @@ pub const Module = struct {
1150		1150
1151	for (self.decls) \|decl, i\| {	1151	for (self.decls) \|decl, i\| {
1152	write.next_instr_index = 0;	1152	write.next_instr_index = 0;
1153	try stream.print("@{} ", .{decl.name});	1153	try stream.print("@{s} ", .{decl.name});
1154	try write.writeInstToStream(stream, decl.inst);	1154	try write.writeInstToStream(stream, decl.inst);
1155	try stream.writeByte('\n');	1155	try stream.writeByte('\n');
1156	}	1156	}
...	@@ -1206,13 +1206,13 @@ const Writer = struct {	...	@@ -1206,13 +1206,13 @@ const Writer = struct {
1206	if (@typeInfo(arg_field.field_type) == .Optional) {	1206	if (@typeInfo(arg_field.field_type) == .Optional) {
1207	if (@field(inst.kw_args, arg_field.name)) \|non_optional\| {	1207	if (@field(inst.kw_args, arg_field.name)) \|non_optional\| {
1208	if (need_comma) try stream.writeAll(", ");	1208	if (need_comma) try stream.writeAll(", ");
1209	try stream.print("{}=", .{arg_field.name});	1209	try stream.print("{s}=", .{arg_field.name});
1210	try self.writeParamToStream(stream, &non_optional);	1210	try self.writeParamToStream(stream, &non_optional);
1211	need_comma = true;	1211	need_comma = true;
1212	}	1212	}
1213	} else {	1213	} else {
1214	if (need_comma) try stream.writeAll(", ");	1214	if (need_comma) try stream.writeAll(", ");
1215	try stream.print("{}=", .{arg_field.name});	1215	try stream.print("{s}=", .{arg_field.name});
1216	try self.writeParamToStream(stream, &@field(inst.kw_args, arg_field.name));	1216	try self.writeParamToStream(stream, &@field(inst.kw_args, arg_field.name));
1217	need_comma = true;	1217	need_comma = true;
1218	}	1218	}
...	@@ -1334,16 +1334,16 @@ const Writer = struct {	...	@@ -1334,16 +1334,16 @@ const Writer = struct {
1334	if (info.index) \|i\| {	1334	if (info.index) \|i\| {
1335	try stream.print("%{}", .{info.index});	1335	try stream.print("%{}", .{info.index});
1336	} else {	1336	} else {
1337	try stream.print("@{}", .{info.name});	1337	try stream.print("@{s}", .{info.name});
1338	}	1338	}
1339	} else if (inst.cast(Inst.DeclVal)) \|decl_val\| {	1339	} else if (inst.cast(Inst.DeclVal)) \|decl_val\| {
1340	try stream.print("@{}", .{decl_val.positionals.name});	1340	try stream.print("@{s}", .{decl_val.positionals.name});
1341	} else if (inst.cast(Inst.DeclValInModule)) \|decl_val\| {	1341	} else if (inst.cast(Inst.DeclValInModule)) \|decl_val\| {
1342	try stream.print("@{}", .{decl_val.positionals.decl.name});	1342	try stream.print("@{s}", .{decl_val.positionals.decl.name});
1343	} else {	1343	} else {
1344	// This should be unreachable in theory, but since ZIR is used for debugging the compiler	1344	// This should be unreachable in theory, but since ZIR is used for debugging the compiler
1345	// we output some debug text instead.	1345	// we output some debug text instead.
1346	try stream.print("?{}?", .{@tagName(inst.tag)});	1346	try stream.print("?{s}?", .{@tagName(inst.tag)});
1347	}	1347	}
1348	}	1348	}
1349	};	1349	};
...	@@ -1424,7 +1424,7 @@ const Parser = struct {	...	@@ -1424,7 +1424,7 @@ const Parser = struct {
1424	const decl = try parseInstruction(self, &body_context, ident);	1424	const decl = try parseInstruction(self, &body_context, ident);
1425	const ident_index = body_context.instructions.items.len;	1425	const ident_index = body_context.instructions.items.len;
1426	if (try body_context.name_map.fetchPut(ident, decl.inst)) \|_\| {	1426	if (try body_context.name_map.fetchPut(ident, decl.inst)) \|_\| {
1427	return self.fail("redefinition of identifier '{}'", .{ident});	1427	return self.fail("redefinition of identifier '{s}'", .{ident});
1428	}	1428	}
1429	try body_context.instructions.append(decl.inst);	1429	try body_context.instructions.append(decl.inst);
1430	continue;	1430	continue;
...	@@ -1510,7 +1510,7 @@ const Parser = struct {	...	@@ -1510,7 +1510,7 @@ const Parser = struct {
1510	const decl = try parseInstruction(self, null, ident);	1510	const decl = try parseInstruction(self, null, ident);
1511	const ident_index = self.decls.items.len;	1511	const ident_index = self.decls.items.len;
1512	if (try self.global_name_map.fetchPut(ident, decl.inst)) \|_\| {	1512	if (try self.global_name_map.fetchPut(ident, decl.inst)) \|_\| {
1513	return self.fail("redefinition of identifier '{}'", .{ident});	1513	return self.fail("redefinition of identifier '{s}'", .{ident});
1514	}	1514	}
1515	try self.decls.append(self.allocator, decl);	1515	try self.decls.append(self.allocator, decl);
1516	},	1516	},
...	@@ -1538,7 +1538,7 @@ const Parser = struct {	...	@@ -1538,7 +1538,7 @@ const Parser = struct {
1538	for (bytes) \|byte\| {	1538	for (bytes) \|byte\| {
1539	if (self.source[self.i] != byte) {	1539	if (self.source[self.i] != byte) {
1540	self.i = start;	1540	self.i = start;
1541	return self.fail("expected '{}'", .{bytes});	1541	return self.fail("expected '{s}'", .{bytes});
1542	}	1542	}
1543	self.i += 1;	1543	self.i += 1;
1544	}	1544	}
...	@@ -1585,7 +1585,7 @@ const Parser = struct {	...	@@ -1585,7 +1585,7 @@ const Parser = struct {
1585	return parseInstructionGeneric(self, field.name, tag.Type(), tag, body_ctx, name, contents_start);	1585	return parseInstructionGeneric(self, field.name, tag.Type(), tag, body_ctx, name, contents_start);
1586	}	1586	}
1587	}	1587	}
1588	return self.fail("unknown instruction '{}'", .{fn_name});	1588	return self.fail("unknown instruction '{s}'", .{fn_name});
1589	}	1589	}
1590		1590
1591	fn parseInstructionGeneric(	1591	fn parseInstructionGeneric(
...	@@ -1621,7 +1621,7 @@ const Parser = struct {	...	@@ -1621,7 +1621,7 @@ const Parser = struct {
1621	self.i += 1;	1621	self.i += 1;
1622	skipSpace(self);	1622	skipSpace(self);
1623	} else if (self.source[self.i] == ')') {	1623	} else if (self.source[self.i] == ')') {
1624	return self.fail("expected positional parameter '{}'", .{arg_field.name});	1624	return self.fail("expected positional parameter '{s}'", .{arg_field.name});
1625	}	1625	}
1626	@field(inst_specific.positionals, arg_field.name) = try parseParameterGeneric(	1626	@field(inst_specific.positionals, arg_field.name) = try parseParameterGeneric(
1627	self,	1627	self,
...	@@ -1648,7 +1648,7 @@ const Parser = struct {	...	@@ -1648,7 +1648,7 @@ const Parser = struct {
1648	break;	1648	break;
1649	}	1649	}
1650	} else {	1650	} else {
1651	return self.fail("unrecognized keyword parameter: '{}'", .{name});	1651	return self.fail("unrecognized keyword parameter: '{s}'", .{name});
1652	}	1652	}
1653	skipSpace(self);	1653	skipSpace(self);
1654	}	1654	}
...	@@ -1672,7 +1672,7 @@ const Parser = struct {	...	@@ -1672,7 +1672,7 @@ const Parser = struct {
1672	' ', '\n', ',', ')' => {	1672	' ', '\n', ',', ')' => {
1673	const enum_name = self.source[start..self.i];	1673	const enum_name = self.source[start..self.i];
1674	return std.meta.stringToEnum(T, enum_name) orelse {	1674	return std.meta.stringToEnum(T, enum_name) orelse {
1675	return self.fail("tag '{}' not a member of enum '{}'", .{ enum_name, @typeName(T) });	1675	return self.fail("tag '{s}' not a member of enum '{s}'", .{ enum_name, @typeName(T) });
1676	};	1676	};
1677	},	1677	},
1678	0 => return self.failByte(0),	1678	0 => return self.failByte(0),
...	@@ -1710,7 +1710,7 @@ const Parser = struct {	...	@@ -1710,7 +1710,7 @@ const Parser = struct {
1710	BigIntConst => return self.parseIntegerLiteral(),	1710	BigIntConst => return self.parseIntegerLiteral(),
1711	usize => {	1711	usize => {
1712	const big_int = try self.parseIntegerLiteral();	1712	const big_int = try self.parseIntegerLiteral();
1713	return big_int.to(usize) catch \|err\| return self.fail("integer literal: {}", .{@errorName(err)});	1713	return big_int.to(usize) catch \|err\| return self.fail("integer literal: {s}", .{@errorName(err)});
1714	},	1714	},
1715	TypedValue => return self.fail("'const' is a special instruction; not legal in ZIR text", .{}),	1715	TypedValue => return self.fail("'const' is a special instruction; not legal in ZIR text", .{}),
1716	*IrModule.Decl => return self.fail("'declval_in_module' is a special instruction; not legal in ZIR text", .{}),	1716	*IrModule.Decl => return self.fail("'declval_in_module' is a special instruction; not legal in ZIR text", .{}),
...	@@ -1759,7 +1759,7 @@ const Parser = struct {	...	@@ -1759,7 +1759,7 @@ const Parser = struct {
1759	},	1759	},
1760	else => @compileError("Unimplemented: ir parseParameterGeneric for type " ++ @typeName(T)),	1760	else => @compileError("Unimplemented: ir parseParameterGeneric for type " ++ @typeName(T)),
1761	}	1761	}
1762	return self.fail("TODO parse parameter {}", .{@typeName(T)});	1762	return self.fail("TODO parse parameter {s}", .{@typeName(T)});
1763	}	1763	}
1764		1764
1765	fn parseParameterInst(self: Parser, body_ctx: ?Body) !*Inst {	1765	fn parseParameterInst(self: Parser, body_ctx: ?Body) !*Inst {
...	@@ -1788,7 +1788,7 @@ const Parser = struct {	...	@@ -1788,7 +1788,7 @@ const Parser = struct {
1788	const src = name_start - 1;	1788	const src = name_start - 1;
1789	if (local_ref) {	1789	if (local_ref) {
1790	self.i = src;	1790	self.i = src;
1791	return self.fail("unrecognized identifier: {}", .{bad_name});	1791	return self.fail("unrecognized identifier: {s}", .{bad_name});
1792	} else {	1792	} else {
1793	const declval = try self.arena.allocator.create(Inst.DeclVal);	1793	const declval = try self.arena.allocator.create(Inst.DeclVal);
1794	declval.* = .{	1794	declval.* = .{
...	@@ -1873,7 +1873,7 @@ pub fn dumpFn(old_module: IrModule, module_fn: *IrModule.Fn) void {	...	@@ -1873,7 +1873,7 @@ pub fn dumpFn(old_module: IrModule, module_fn: *IrModule.Fn) void {
1873		1873
1874	const fn_ty = module_fn.owner_decl.typed_value.most_recent.typed_value.ty;	1874	const fn_ty = module_fn.owner_decl.typed_value.most_recent.typed_value.ty;
1875	_ = ctx.emitFn(module_fn, 0, fn_ty) catch \|err\| {	1875	_ = ctx.emitFn(module_fn, 0, fn_ty) catch \|err\| {
1876	std.debug.print("unable to dump function: {}\n", .{err});	1876	std.debug.print("unable to dump function: {s}\n", .{@errorName(err)});
1877	return;	1877	return;
1878	};	1878	};
1879	var module = Module{	1879	var module = Module{
...	@@ -2203,7 +2203,7 @@ const EmitZIR = struct {	...	@@ -2203,7 +2203,7 @@ const EmitZIR = struct {
2203	};	2203	};
2204	return self.emitStringLiteral(src, bytes);	2204	return self.emitStringLiteral(src, bytes);
2205	},	2205	},
2206	else => \|t\| std.debug.panic("TODO implement emitTypedValue for pointer to {}", .{@tagName(t)}),	2206	else => \|t\| std.debug.panic("TODO implement emitTypedValue for pointer to {s}", .{@tagName(t)}),
2207	}	2207	}
2208	},	2208	},
2209	.ComptimeInt => return self.emitComptimeIntVal(src, typed_value.val),	2209	.ComptimeInt => return self.emitComptimeIntVal(src, typed_value.val),
...	@@ -2274,7 +2274,7 @@ const EmitZIR = struct {	...	@@ -2274,7 +2274,7 @@ const EmitZIR = struct {
2274	};	2274	};
2275	return self.emitUnnamedDecl(&inst.base);	2275	return self.emitUnnamedDecl(&inst.base);
2276	},	2276	},
2277	else => \|t\| std.debug.panic("TODO implement emitTypedValue for {}", .{@tagName(t)}),	2277	else => \|t\| std.debug.panic("TODO implement emitTypedValue for {s}", .{@tagName(t)}),
2278	}	2278	}
2279	}	2279	}
2280		2280
...	@@ -2947,7 +2947,7 @@ pub fn dumpZir(allocator: Allocator, kind: []const u8, decl_name: [:0]const u8	...	@@ -2947,7 +2947,7 @@ pub fn dumpZir(allocator: Allocator, kind: []const u8, decl_name: [:0]const u8
2947	try write.inst_table.ensureCapacity(@intCast(u32, instructions.len));	2947	try write.inst_table.ensureCapacity(@intCast(u32, instructions.len));
2948		2948
2949	const stderr = std.io.getStdErr().outStream();	2949	const stderr = std.io.getStdErr().outStream();
2950	try stderr.print("{} {s} {{ // unanalyzed\n", .{ kind, decl_name });	2950	try stderr.print("{s} {s} {{ // unanalyzed\n", .{ kind, decl_name });
2951		2951
2952	for (instructions) \|inst\| {	2952	for (instructions) \|inst\| {
2953	const my_i = write.next_instr_index;	2953	const my_i = write.next_instr_index;
...	@@ -2967,5 +2967,5 @@ pub fn dumpZir(allocator: Allocator, kind: []const u8, decl_name: [:0]const u8	...	@@ -2967,5 +2967,5 @@ pub fn dumpZir(allocator: Allocator, kind: []const u8, decl_name: [:0]const u8
2967	try stderr.writeByte('\n');	2967	try stderr.writeByte('\n');
2968	}	2968	}
2969		2969
2970	try stderr.print("}} // {} {s}\n\n", .{ kind, decl_name });	2970	try stderr.print("}} // {s} {s}\n\n", .{ kind, decl_name });
2971	}	2971	}

...	@@ -1475,7 +1475,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor	...	@@ -1475,7 +1475,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1475	// lifetime annotations in the ZIR.	1475	// lifetime annotations in the ZIR.
1476	var decl_arena = decl.typed_value.most_recent.arena.?.promote(module.gpa);	1476	var decl_arena = decl.typed_value.most_recent.arena.?.promote(module.gpa);
1477	defer decl.typed_value.most_recent.arena.?.* = decl_arena.state;	1477	defer decl.typed_value.most_recent.arena.?.* = decl_arena.state;
1478	log.debug("analyze liveness of {}\n", .{decl.name});	1478	log.debug("analyze liveness of {s}\n", .{decl.name});
1479	try liveness.analyze(module.gpa, &decl_arena.allocator, func.analysis.success);	1479	try liveness.analyze(module.gpa, &decl_arena.allocator, func.analysis.success);
1480	}	1480	}
1481		1481
...	@@ -1492,7 +1492,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor	...	@@ -1492,7 +1492,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1492	module.failed_decls.putAssumeCapacityNoClobber(decl, try ErrorMsg.create(	1492	module.failed_decls.putAssumeCapacityNoClobber(decl, try ErrorMsg.create(
1493	module.gpa,	1493	module.gpa,
1494	decl.src(),	1494	decl.src(),
1495	"unable to codegen: {}",	1495	"unable to codegen: {s}",
1496	.{@errorName(err)},	1496	.{@errorName(err)},
1497	));	1497	));
1498	decl.analysis = .codegen_failure_retryable;	1498	decl.analysis = .codegen_failure_retryable;
...	@@ -1535,7 +1535,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor	...	@@ -1535,7 +1535,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1535	module.failed_decls.putAssumeCapacityNoClobber(decl, try ErrorMsg.create(	1535	module.failed_decls.putAssumeCapacityNoClobber(decl, try ErrorMsg.create(
1536	module.gpa,	1536	module.gpa,
1537	decl.src(),	1537	decl.src(),
1538	"unable to update line number: {}",	1538	"unable to update line number: {s}",
1539	.{@errorName(err)},	1539	.{@errorName(err)},
1540	));	1540	));
1541	decl.analysis = .codegen_failure_retryable;	1541	decl.analysis = .codegen_failure_retryable;
...	@@ -1544,50 +1544,50 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor	...	@@ -1544,50 +1544,50 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
1544	.glibc_crt_file => \|crt_file\| {	1544	.glibc_crt_file => \|crt_file\| {
1545	glibc.buildCRTFile(self, crt_file) catch \|err\| {	1545	glibc.buildCRTFile(self, crt_file) catch \|err\| {
1546	// TODO Expose this as a normal compile error rather than crashing here.	1546	// TODO Expose this as a normal compile error rather than crashing here.
1547	fatal("unable to build glibc CRT file: {}", .{@errorName(err)});	1547	fatal("unable to build glibc CRT file: {s}", .{@errorName(err)});
1548	};	1548	};
1549	},	1549	},
1550	.glibc_shared_objects => {	1550	.glibc_shared_objects => {
1551	glibc.buildSharedObjects(self) catch \|err\| {	1551	glibc.buildSharedObjects(self) catch \|err\| {
1552	// TODO Expose this as a normal compile error rather than crashing here.	1552	// TODO Expose this as a normal compile error rather than crashing here.
1553	fatal("unable to build glibc shared objects: {}", .{@errorName(err)});	1553	fatal("unable to build glibc shared objects: {s}", .{@errorName(err)});
1554	};	1554	};
1555	},	1555	},
1556	.musl_crt_file => \|crt_file\| {	1556	.musl_crt_file => \|crt_file\| {
1557	musl.buildCRTFile(self, crt_file) catch \|err\| {	1557	musl.buildCRTFile(self, crt_file) catch \|err\| {
1558	// TODO Expose this as a normal compile error rather than crashing here.	1558	// TODO Expose this as a normal compile error rather than crashing here.

...	@@ -118,7 +118,7 @@ pub fn main() anyerror!void {	...	@@ -118,7 +118,7 @@ pub fn main() anyerror!void {
118		118
119	pub fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	119	pub fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
120	if (args.len <= 1) {	120	if (args.len <= 1) {
121	std.log.info("{}", .{usage});	121	std.log.info("{s}", .{usage});
122	fatal("expected command argument", .{});	122	fatal("expected command argument", .{});
123	}	123	}
124		124
...	@@ -204,8 +204,8 @@ pub fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !v	...	@@ -204,8 +204,8 @@ pub fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !v
204	} else if (mem.eql(u8, cmd, "help") or mem.eql(u8, cmd, "-h") or mem.eql(u8, cmd, "--help")) {	204	} else if (mem.eql(u8, cmd, "help") or mem.eql(u8, cmd, "-h") or mem.eql(u8, cmd, "--help")) {
205	try io.getStdOut().writeAll(usage);	205	try io.getStdOut().writeAll(usage);
206	} else {	206	} else {
207	std.log.info("{}", .{usage});	207	std.log.info("{s}", .{usage});
208	fatal("unknown command: {}", .{args[1]});	208	fatal("unknown command: {s}", .{args[1]});
209	}	209	}
210	}	210	}
211		211
...	@@ -615,7 +615,7 @@ fn buildOutputType(	...	@@ -615,7 +615,7 @@ fn buildOutputType(
615	fatal("unexpected end-of-parameter mark: --", .{});	615	fatal("unexpected end-of-parameter mark: --", .{});
616	}	616	}
617	} else if (mem.eql(u8, arg, "--pkg-begin")) {	617	} else if (mem.eql(u8, arg, "--pkg-begin")) {
618	if (i + 2 >= args.len) fatal("Expected 2 arguments after {}", .{arg});	618	if (i + 2 >= args.len) fatal("Expected 2 arguments after {s}", .{arg});
619	i += 1;	619	i += 1;
620	const pkg_name = args[i];	620	const pkg_name = args[i];
621	i += 1;	621	i += 1;
...	@@ -635,7 +635,7 @@ fn buildOutputType(	...	@@ -635,7 +635,7 @@ fn buildOutputType(
635	cur_pkg = cur_pkg.parent orelse	635	cur_pkg = cur_pkg.parent orelse
636	fatal("encountered --pkg-end with no matching --pkg-begin", .{});	636	fatal("encountered --pkg-end with no matching --pkg-begin", .{});
637	} else if (mem.eql(u8, arg, "--main-pkg-path")) {	637	} else if (mem.eql(u8, arg, "--main-pkg-path")) {
638	if (i + 1 >= args.len) fatal("expected parameter after {}", .{arg});	638	if (i + 1 >= args.len) fatal("expected parameter after {s}", .{arg});
639	i += 1;	639	i += 1;
640	main_pkg_path = args[i];	640	main_pkg_path = args[i];
641	} else if (mem.eql(u8, arg, "-cflags")) {	641	} else if (mem.eql(u8, arg, "-cflags")) {
...	@@ -653,10 +653,10 @@ fn buildOutputType(	...	@@ -653,10 +653,10 @@ fn buildOutputType(
653	i += 1;	653	i += 1;
654	const next_arg = args[i];	654	const next_arg = args[i];
655	color = std.meta.stringToEnum(Color, next_arg) orelse {	655	color = std.meta.stringToEnum(Color, next_arg) orelse {
656	fatal("expected [auto\|on\|off] after --color, found '{}'", .{next_arg});	656	fatal("expected [auto\|on\|off] after --color, found '{s}'", .{next_arg});
657	};	657	};
658	} else if (mem.eql(u8, arg, "--subsystem")) {	658	} else if (mem.eql(u8, arg, "--subsystem")) {

...	@@ -136,7 +136,7 @@ const Scope = struct {	...	@@ -136,7 +136,7 @@ const Scope = struct {
136	var proposed_name = name_copy;	136	var proposed_name = name_copy;
137	while (scope.contains(proposed_name)) {	137	while (scope.contains(proposed_name)) {
138	scope.mangle_count += 1;	138	scope.mangle_count += 1;
139	proposed_name = try std.fmt.allocPrint(c.arena, "{}_{}", .{ name, scope.mangle_count });	139	proposed_name = try std.fmt.allocPrint(c.arena, "{s}_{}", .{ name, scope.mangle_count });
140	}	140	}
141	try scope.variables.append(.{ .name = name_copy, .alias = proposed_name });	141	try scope.variables.append(.{ .name = name_copy, .alias = proposed_name });
142	return proposed_name;	142	return proposed_name;
...	@@ -290,7 +290,7 @@ pub const Context = struct {	...	@@ -290,7 +290,7 @@ pub const Context = struct {
290		290
291	const line = c.source_manager.getSpellingLineNumber(spelling_loc);	291	const line = c.source_manager.getSpellingLineNumber(spelling_loc);
292	const column = c.source_manager.getSpellingColumnNumber(spelling_loc);	292	const column = c.source_manager.getSpellingColumnNumber(spelling_loc);
293	return std.fmt.allocPrint(c.arena, "{}:{}:{}", .{ filename, line, column });	293	return std.fmt.allocPrint(c.arena, "{s}:{d}:{d}", .{ filename, line, column });
294	}	294	}
295		295
296	fn createCall(c: Context, fn_expr: ast.Node, params_len: ast.NodeIndex) !*ast.Node.Call {	296	fn createCall(c: Context, fn_expr: ast.Node, params_len: ast.NodeIndex) !*ast.Node.Call {
...	@@ -530,7 +530,7 @@ fn declVisitor(c: Context, decl: const clang.Decl) Error!void {	...	@@ -530,7 +530,7 @@ fn declVisitor(c: Context, decl: const clang.Decl) Error!void {
530	},	530	},
531	else => {	531	else => {
532	const decl_name = try c.str(decl.getDeclKindName());	532	const decl_name = try c.str(decl.getDeclKindName());
533	try emitWarning(c, decl.getLocation(), "ignoring {} declaration", .{decl_name});	533	try emitWarning(c, decl.getLocation(), "ignoring {s} declaration", .{decl_name});
534	},	534	},
535	}	535	}
536	}	536	}
...	@@ -625,7 +625,7 @@ fn visitFnDecl(c: Context, fn_decl: const clang.FunctionDecl) Error!void {	...	@@ -625,7 +625,7 @@ fn visitFnDecl(c: Context, fn_decl: const clang.FunctionDecl) Error!void {
625	const param_name = if (param.name_token) \|name_tok\|	625	const param_name = if (param.name_token) \|name_tok\|
626	tokenSlice(c, name_tok)	626	tokenSlice(c, name_tok)
627	else	627	else
628	return failDecl(c, fn_decl_loc, fn_name, "function {} parameter has no name", .{fn_name});	628	return failDecl(c, fn_decl_loc, fn_name, "function {s} parameter has no name", .{fn_name});
629		629
630	const c_param = fn_decl.getParamDecl(param_id);	630	const c_param = fn_decl.getParamDecl(param_id);
631	const qual_type = c_param.getOriginalType();	631	const qual_type = c_param.getOriginalType();
...	@@ -634,7 +634,7 @@ fn visitFnDecl(c: Context, fn_decl: const clang.FunctionDecl) Error!void {	...	@@ -634,7 +634,7 @@ fn visitFnDecl(c: Context, fn_decl: const clang.FunctionDecl) Error!void {
634	const mangled_param_name = try block_scope.makeMangledName(c, param_name);	634	const mangled_param_name = try block_scope.makeMangledName(c, param_name);
635		635
636	if (!is_const) {	636	if (!is_const) {
637	const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{}", .{mangled_param_name});	637	const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{s}", .{mangled_param_name});
638	const arg_name = try block_scope.makeMangledName(c, bare_arg_name);	638	const arg_name = try block_scope.makeMangledName(c, bare_arg_name);
639		639
640	const mut_tok = try appendToken(c, .Keyword_var, "var");	640	const mut_tok = try appendToken(c, .Keyword_var, "var");

...	@@ -274,7 +274,7 @@ pub fn resolveInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!	...	@@ -274,7 +274,7 @@ pub fn resolveInst(mod: Module, scope: Scope, old_inst: *zir.Inst) InnerError!
274	const entry = if (old_inst.cast(zir.Inst.DeclVal)) \|declval\| blk: {	274	const entry = if (old_inst.cast(zir.Inst.DeclVal)) \|declval\| blk: {
275	const decl_name = declval.positionals.name;	275	const decl_name = declval.positionals.name;
276	const entry = zir_module.contents.module.findDecl(decl_name) orelse	276	const entry = zir_module.contents.module.findDecl(decl_name) orelse
277	return mod.fail(scope, old_inst.src, "decl '{}' not found", .{decl_name});	277	return mod.fail(scope, old_inst.src, "decl '{s}' not found", .{decl_name});
278	break :blk entry;	278	break :blk entry;
279	} else blk: {	279	} else blk: {
280	// If this assert trips, the instruction that was referenced did not get	280	// If this assert trips, the instruction that was referenced did not get
...	@@ -564,14 +564,14 @@ fn analyzeInstStr(mod: Module, scope: Scope, str_inst: *zir.Inst.Str) InnerErr	...	@@ -564,14 +564,14 @@ fn analyzeInstStr(mod: Module, scope: Scope, str_inst: *zir.Inst.Str) InnerErr
564	fn analyzeInstExport(mod: Module, scope: Scope, export_inst: zir.Inst.Export) InnerError!Inst {	564	fn analyzeInstExport(mod: Module, scope: Scope, export_inst: zir.Inst.Export) InnerError!Inst {
565	const symbol_name = try resolveConstString(mod, scope, export_inst.positionals.symbol_name);	565	const symbol_name = try resolveConstString(mod, scope, export_inst.positionals.symbol_name);
566	const exported_decl = mod.lookupDeclName(scope, export_inst.positionals.decl_name) orelse	566	const exported_decl = mod.lookupDeclName(scope, export_inst.positionals.decl_name) orelse
567	return mod.fail(scope, export_inst.base.src, "decl '{}' not found", .{export_inst.positionals.decl_name});	567	return mod.fail(scope, export_inst.base.src, "decl '{s}' not found", .{export_inst.positionals.decl_name});
568	try mod.analyzeExport(scope, export_inst.base.src, symbol_name, exported_decl);	568	try mod.analyzeExport(scope, export_inst.base.src, symbol_name, exported_decl);
569	return mod.constVoid(scope, export_inst.base.src);	569	return mod.constVoid(scope, export_inst.base.src);
570	}	570	}
571		571
572	fn analyzeInstCompileError(mod: Module, scope: Scope, inst: zir.Inst.UnOp) InnerError!Inst {	572	fn analyzeInstCompileError(mod: Module, scope: Scope, inst: zir.Inst.UnOp) InnerError!Inst {
573	const msg = try resolveConstString(mod, scope, inst.positionals.operand);	573	const msg = try resolveConstString(mod, scope, inst.positionals.operand);
574	return mod.fail(scope, inst.base.src, "{}", .{msg});	574	return mod.fail(scope, inst.base.src, "{s}", .{msg});
575	}	575	}
576		576
577	fn analyzeInstArg(mod: Module, scope: Scope, inst: zir.Inst.Arg) InnerError!Inst {	577	fn analyzeInstArg(mod: Module, scope: Scope, inst: zir.Inst.Arg) InnerError!Inst {
...	@@ -918,7 +918,7 @@ fn analyzeInstErrorSet(mod: Module, scope: Scope, inst: *zir.Inst.ErrorSet) In	...	@@ -918,7 +918,7 @@ fn analyzeInstErrorSet(mod: Module, scope: Scope, inst: *zir.Inst.ErrorSet) In
918	for (inst.positionals.fields) \|field_name\| {	918	for (inst.positionals.fields) \|field_name\| {
919	const entry = try mod.getErrorValue(field_name);	919	const entry = try mod.getErrorValue(field_name);
920	if (payload.data.fields.fetchPutAssumeCapacity(entry.key, entry.value)) \|prev\| {	920	if (payload.data.fields.fetchPutAssumeCapacity(entry.key, entry.value)) \|prev\| {
921	return mod.fail(scope, inst.base.src, "duplicate error: '{}'", .{field_name});	921	return mod.fail(scope, inst.base.src, "duplicate error: '{s}'", .{field_name});
922	}	922	}
923	}	923	}
924	// TODO create name in format "error:line:column"	924	// TODO create name in format "error:line:column"
...	@@ -1068,7 +1068,7 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr	...	@@ -1068,7 +1068,7 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr
1068	return mod.fail(	1068	return mod.fail(
1069	scope,	1069	scope,
1070	fieldptr.positionals.field_name.src,	1070	fieldptr.positionals.field_name.src,
1071	"no member named '{}' in '{}'",	1071	"no member named '{s}' in '{}'",
1072	.{ field_name, elem_ty },	1072	.{ field_name, elem_ty },
1073	);	1073	);
1074	}	1074	}
...	@@ -1089,7 +1089,7 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr	...	@@ -1089,7 +1089,7 @@ fn analyzeInstFieldPtr(mod: Module, scope: Scope, fieldptr: *zir.Inst.FieldPtr