Commit 7217148edf28a0d3ab69b8c36b13d29c023e12fd | zig

2 files changed, 11 insertions(+), 3 deletions(-)

build.zig+2-1

...	...	@@ -613,7 +613,8 @@ fn addCxxKnownPath(
613	613	ctx.cxx_compiler,
614	614	b.fmt("-print-file-name={s}", .{objname}),
615	615	});
616		const path_unpadded = mem.tokenize(u8, path_padded, "\r\n").next().?;
	616	var tokenizer = mem.tokenize(u8, path_padded, "\r\n");
	617	const path_unpadded = tokenizer.next().?;
617	618	if (mem.eql(u8, path_unpadded, objname)) {
618	619	if (errtxt) \|msg\| {
619	620	std.debug.print("{s}", .{msg});

src/value.zig+9-2

...	...	@@ -461,7 +461,7 @@ pub const Value = extern union {
461	461	=> unreachable,
462	462
463	463	.ty, .lazy_align => {
464		const payload = self.castTag(.ty).?;
	464	const payload = self.cast(Payload.Ty).?;
465	465	const new_payload = try arena.create(Payload.Ty);
466	466	new_payload.* = .{
467	467	.base = payload.base,
...	...	@@ -718,7 +718,7 @@ pub const Value = extern union {
718	718	.lazy_align => {
719	719	try out_stream.writeAll("@alignOf(");
720	720	try val.castTag(.lazy_align).?.data.dump("", options, out_stream);
721		try out_stream.writeAll(")");
	721	return try out_stream.writeAll(")");
722	722	},
723	723	.int_type => {
724	724	const int_type = val.castTag(.int_type).?.data;
...	...	@@ -2478,6 +2478,13 @@ pub const Value = extern union {
2478	2478	.the_only_possible_value,
2479	2479	=> return hashInt(ptr_val, hasher, target),
2480	2480
	2481	.lazy_align => {
	2482	// Bit weird to have this here but this function is also called
	2483	// on integers.
	2484	const ty = ptr_val.castTag(.lazy_align).?.data;
	2485	ty.hashWithHasher(hasher, target);
	2486	},
	2487
2481	2488	else => unreachable,
2482	2489	}
2483	2490	}