Commit 18608223ef5e588598d21dfe71678dbc62f320e4 | zig

author	Techatrix <techatrix@mailbox.org> 2023-11-25 04:30:48+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-11-25 04:09:53-05:00
log	18608223ef5e588598d21dfe71678dbc62f320e4
tree	407e0a98f6786f55c998fa42b402d55292db293e
parent	e834e95d718fe3eacaec54034462c90fd10bfe76

convert `toType` and `toValue` to `Type.fromInterned` and `Value.fromInterned`

32 files changed, 1398 insertions(+), 1390 deletions(-)

src
- Air.zig
- Autodoc.zig
- InternPool.zig
- Module.zig
- RangeSet.zig
- Sema.zig
- TypedValue.zig
- arch
  - aarch64
    CodeGen.zig
    abi.zig
  - arm
    CodeGen.zig
    abi.zig
  - riscv64
    CodeGen.zig
  - sparc64
    CodeGen.zig
  - wasm
    CodeGen.zig
    abi.zig
  - x86_64
    CodeGen.zig
    abi.zig
- codegen.zig
- codegen
- link
- print_air.zig
- type.zig
- value.zig

src/Air.zig+6-6

src/Autodoc.zig+1-1

...	@@ -117,7 +117,7 @@ fn generateZirData(self: *Autodoc, output_dir: std.fs.Dir) !void {	...	@@ -117,7 +117,7 @@ fn generateZirData(self: *Autodoc, output_dir: std.fs.Dir) !void {
117	// Not a real type, doesn't have a normal name	117	// Not a real type, doesn't have a normal name
118	try tmpbuf.writer().writeAll("(generic poison)");	118	try tmpbuf.writer().writeAll("(generic poison)");
119	} else {	119	} else {
120	try ip_index.toType().fmt(self.comp_module).format("", .{}, tmpbuf.writer());	120	try @import("type.zig").Type.fromInterned(ip_index).fmt(self.comp_module).format("", .{}, tmpbuf.writer());
121	}	121	}
122	try self.types.append(	122	try self.types.append(
123	self.arena,	123	self.arena,

src/InternPool.zig+2-15

...	@@ -2096,19 +2096,6 @@ pub const Index = enum(u32) {	...	@@ -2096,19 +2096,6 @@ pub const Index = enum(u32) {
2096	}	2096	}
2097	};	2097	};
2098		2098
2099	pub fn toType(i: Index) @import("type.zig").Type {
2100	assert(i != .none);
2101	return .{ .ip_index = i };
2102	}
2103
2104	pub fn toValue(i: Index) @import("value.zig").Value {
2105	assert(i != .none);
2106	return .{
2107	.ip_index = i,
2108	.legacy = undefined,
2109	};
2110	}
2111
2112	/// Used for a map of `Index` values to the index within a list of `Index` values.	2099	/// Used for a map of `Index` values to the index within a list of `Index` values.
2113	const Adapter = struct {	2100	const Adapter = struct {
2114	indexes: []const Index,	2101	indexes: []const Index,
...	@@ -6145,8 +6132,8 @@ fn finishFuncInstance(	...	@@ -6145,8 +6132,8 @@ fn finishFuncInstance(
6145	.src_line = fn_owner_decl.src_line,	6132	.src_line = fn_owner_decl.src_line,
6146	.has_tv = true,	6133	.has_tv = true,
6147	.owns_tv = true,	6134	.owns_tv = true,
6148	.ty = func_ty.toType(),	6135	.ty = @import("type.zig").Type.fromInterned(func_ty),
6149	.val = func_index.toValue(),	6136	.val = @import("value.zig").Value.fromInterned(func_index),
6150	.alignment = .none,	6137	.alignment = .none,
6151	.@"linksection" = section,	6138	.@"linksection" = section,
6152	.@"addrspace" = fn_owner_decl.@"addrspace",	6139	.@"addrspace" = fn_owner_decl.@"addrspace",

src/Module.zig+61-61

...	@@ -659,7 +659,7 @@ pub const Decl = struct {	...	@@ -659,7 +659,7 @@ pub const Decl = struct {
659	pub fn internValue(decl: Decl, mod: Module) Allocator.Error!InternPool.Index {	659	pub fn internValue(decl: Decl, mod: Module) Allocator.Error!InternPool.Index {
660	assert(decl.has_tv);	660	assert(decl.has_tv);
661	const ip_index = try decl.val.intern(decl.ty, mod);	661	const ip_index = try decl.val.intern(decl.ty, mod);
662	decl.val = ip_index.toValue();	662	decl.val = Value.fromInterned(ip_index);
663	return ip_index;	663	return ip_index;
664	}	664	}
665		665
...	@@ -3556,8 +3556,8 @@ pub fn semaFile(mod: Module, file: File) SemaError!void {	...	@@ -3556,8 +3556,8 @@ pub fn semaFile(mod: Module, file: File) SemaError!void {
3556	_ = try decl.internValue(mod);	3556	_ = try decl.internValue(mod);
3557	}	3557	}
3558		3558
3559	new_namespace.ty = struct_ty.toType();	3559	new_namespace.ty = Type.fromInterned(struct_ty);
3560	new_decl.val = struct_ty.toValue();	3560	new_decl.val = Value.fromInterned(struct_ty);
3561	new_decl.has_tv = true;	3561	new_decl.has_tv = true;
3562	new_decl.owns_tv = true;	3562	new_decl.owns_tv = true;
3563	new_decl.analysis = .complete;	3563	new_decl.analysis = .complete;
...	@@ -3711,7 +3711,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {	...	@@ -3711,7 +3711,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
3711	return sema.fail(&block_scope, ty_src, "type {} has no namespace", .{ty.fmt(mod)});	3711	return sema.fail(&block_scope, ty_src, "type {} has no namespace", .{ty.fmt(mod)});
3712	}	3712	}
3713		3713
3714	decl.ty = InternPool.Index.type_type.toType();	3714	decl.ty = Type.fromInterned(InternPool.Index.type_type);
3715	decl.val = ty.toValue();	3715	decl.val = ty.toValue();
3716	decl.alignment = .none;	3716	decl.alignment = .none;
3717	decl.@"linksection" = .none;	3717	decl.@"linksection" = .none;
...	@@ -3741,7 +3741,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {	...	@@ -3741,7 +3741,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
3741	}	3741	}
3742		3742
3743	decl.ty = decl_tv.ty;	3743	decl.ty = decl_tv.ty;
3744	decl.val = (try decl_tv.val.intern(decl_tv.ty, mod)).toValue();	3744	decl.val = Value.fromInterned((try decl_tv.val.intern(decl_tv.ty, mod)));
3745	// linksection, align, and addrspace were already set by Sema	3745	// linksection, align, and addrspace were already set by Sema
3746	decl.has_tv = true;	3746	decl.has_tv = true;
3747	decl.owns_tv = owns_tv;	3747	decl.owns_tv = owns_tv;
...	@@ -3794,7 +3794,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {	...	@@ -3794,7 +3794,7 @@ fn semaDecl(mod: *Module, decl_index: Decl.Index) !bool {
3794	}	3794	}
3795		3795
3796	decl.ty = decl_tv.ty;	3796	decl.ty = decl_tv.ty;
3797	decl.val = (try decl_tv.val.intern(decl_tv.ty, mod)).toValue();	3797	decl.val = Value.fromInterned((try decl_tv.val.intern(decl_tv.ty, mod)));
3798	decl.alignment = blk: {	3798	decl.alignment = blk: {
3799	const align_ref = decl.zirAlignRef(mod);	3799	const align_ref = decl.zirAlignRef(mod);
3800	if (align_ref == .none) break :blk .none;	3800	if (align_ref == .none) break :blk .none;
...	@@ -4509,7 +4509,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato	...	@@ -4509,7 +4509,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
4509	.owner_decl_index = decl_index,	4509	.owner_decl_index = decl_index,
4510	.func_index = func_index,	4510	.func_index = func_index,
4511	.func_is_naked = fn_ty_info.cc == .Naked,	4511	.func_is_naked = fn_ty_info.cc == .Naked,
4512	.fn_ret_ty = fn_ty_info.return_type.toType(),	4512	.fn_ret_ty = Type.fromInterned(fn_ty_info.return_type),
4513	.fn_ret_ty_ies = null,	4513	.fn_ret_ty_ies = null,
4514	.owner_func_index = func_index,	4514	.owner_func_index = func_index,
4515	.branch_quota = @max(func.branchQuota(ip).*, Sema.default_branch_quota),	4515	.branch_quota = @max(func.branchQuota(ip).*, Sema.default_branch_quota),
...	@@ -4580,7 +4580,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato	...	@@ -4580,7 +4580,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
4580	const param_ty = fn_ty_info.param_types.get(ip)[runtime_param_index];	4580	const param_ty = fn_ty_info.param_types.get(ip)[runtime_param_index];
4581	runtime_param_index += 1;	4581	runtime_param_index += 1;
4582		4582
4583	const opt_opv = sema.typeHasOnePossibleValue(param_ty.toType()) catch \|err\| switch (err) {	4583	const opt_opv = sema.typeHasOnePossibleValue(Type.fromInterned(param_ty)) catch \|err\| switch (err) {
4584	error.NeededSourceLocation => unreachable,	4584	error.NeededSourceLocation => unreachable,
4585	error.GenericPoison => unreachable,	4585	error.GenericPoison => unreachable,
4586	error.ComptimeReturn => unreachable,	4586	error.ComptimeReturn => unreachable,
...	@@ -4707,7 +4707,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato	...	@@ -4707,7 +4707,7 @@ pub fn analyzeFnBody(mod: *Module, func_index: InternPool.Index, arena: Allocato
4707	// Similarly, resolve any queued up types that were requested to be resolved for	4707	// Similarly, resolve any queued up types that were requested to be resolved for
4708	// the backends.	4708	// the backends.
4709	for (sema.types_to_resolve.keys()) \|ty\| {	4709	for (sema.types_to_resolve.keys()) \|ty\| {
4710	sema.resolveTypeFully(ty.toType()) catch \|err\| switch (err) {	4710	sema.resolveTypeFully(Type.fromInterned(ty)) catch \|err\| switch (err) {
4711	error.NeededSourceLocation => unreachable,	4711	error.NeededSourceLocation => unreachable,
4712	error.GenericPoison => unreachable,	4712	error.GenericPoison => unreachable,
4713	error.ComptimeReturn => unreachable,	4713	error.ComptimeReturn => unreachable,
...	@@ -5392,10 +5392,10 @@ pub fn populateTestFunctions(	...	@@ -5392,10 +5392,10 @@ pub fn populateTestFunctions(
5392	});	5392	});
5393	const test_name_decl_index = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, .none, .{	5393	const test_name_decl_index = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, .none, .{
5394	.ty = test_name_decl_ty,	5394	.ty = test_name_decl_ty,
5395	.val = (try mod.intern(.{ .aggregate = .{	5395	.val = Value.fromInterned((try mod.intern(.{ .aggregate = .{
5396	.ty = test_name_decl_ty.toIntern(),	5396	.ty = test_name_decl_ty.toIntern(),
5397	.storage = .{ .bytes = test_decl_name },	5397	.storage = .{ .bytes = test_decl_name },
5398	} })).toValue(),	5398	} }))),
5399	});	5399	});
5400	break :n test_name_decl_index;	5400	break :n test_name_decl_index;
5401	};	5401	};
...	@@ -5439,10 +5439,10 @@ pub fn populateTestFunctions(	...	@@ -5439,10 +5439,10 @@ pub fn populateTestFunctions(
5439	});	5439	});
5440	const array_decl_index = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, .none, .{	5440	const array_decl_index = try mod.createAnonymousDeclFromDecl(decl, decl.src_namespace, .none, .{
5441	.ty = array_decl_ty,	5441	.ty = array_decl_ty,
5442	.val = (try mod.intern(.{ .aggregate = .{	5442	.val = Value.fromInterned((try mod.intern(.{ .aggregate = .{
5443	.ty = array_decl_ty.toIntern(),	5443	.ty = array_decl_ty.toIntern(),
5444	.storage = .{ .elems = test_fn_vals },	5444	.storage = .{ .elems = test_fn_vals },
5445	} })).toValue(),	5445	} }))),
5446	});	5446	});
5447		5447
5448	break :d array_decl_index;	5448	break :d array_decl_index;
...	@@ -5548,7 +5548,7 @@ pub fn markReferencedDeclsAlive(mod: *Module, val: Value) Allocator.Error!void {	...	@@ -5548,7 +5548,7 @@ pub fn markReferencedDeclsAlive(mod: *Module, val: Value) Allocator.Error!void {
5548	.func => \|func\| try mod.markDeclIndexAlive(func.owner_decl),	5548	.func => \|func\| try mod.markDeclIndexAlive(func.owner_decl),
5549	.error_union => \|error_union\| switch (error_union.val) {	5549	.error_union => \|error_union\| switch (error_union.val) {
5550	.err_name => {},	5550	.err_name => {},
5551	.payload => \|payload\| try mod.markReferencedDeclsAlive(payload.toValue()),	5551	.payload => \|payload\| try mod.markReferencedDeclsAlive(Value.fromInterned(payload)),
5552	},	5552	},
5553	.ptr => \|ptr\| {	5553	.ptr => \|ptr\| {
5554	switch (ptr.addr) {	5554	switch (ptr.addr) {
...	@@ -5556,17 +5556,17 @@ pub fn markReferencedDeclsAlive(mod: *Module, val: Value) Allocator.Error!void {	...	@@ -5556,17 +5556,17 @@ pub fn markReferencedDeclsAlive(mod: *Module, val: Value) Allocator.Error!void {
5556	.anon_decl => {},	5556	.anon_decl => {},
5557	.mut_decl => \|mut_decl\| try mod.markDeclIndexAlive(mut_decl.decl),	5557	.mut_decl => \|mut_decl\| try mod.markDeclIndexAlive(mut_decl.decl),
5558	.int, .comptime_field => {},	5558	.int, .comptime_field => {},
5559	.eu_payload, .opt_payload => \|parent\| try mod.markReferencedDeclsAlive(parent.toValue()),	5559	.eu_payload, .opt_payload => \|parent\| try mod.markReferencedDeclsAlive(Value.fromInterned(parent)),
5560	.elem, .field => \|base_index\| try mod.markReferencedDeclsAlive(base_index.base.toValue()),	5560	.elem, .field => \|base_index\| try mod.markReferencedDeclsAlive(Value.fromInterned(base_index.base)),
5561	}	5561	}
5562	if (ptr.len != .none) try mod.markReferencedDeclsAlive(ptr.len.toValue());	5562	if (ptr.len != .none) try mod.markReferencedDeclsAlive(Value.fromInterned(ptr.len));
5563	},	5563	},
5564	.opt => \|opt\| if (opt.val != .none) try mod.markReferencedDeclsAlive(opt.val.toValue()),	5564	.opt => \|opt\| if (opt.val != .none) try mod.markReferencedDeclsAlive(Value.fromInterned(opt.val)),
5565	.aggregate => \|aggregate\| for (aggregate.storage.values()) \|elem\|	5565	.aggregate => \|aggregate\| for (aggregate.storage.values()) \|elem\|
5566	try mod.markReferencedDeclsAlive(elem.toValue()),	5566	try mod.markReferencedDeclsAlive(Value.fromInterned(elem)),
5567	.un => \|un\| {	5567	.un => \|un\| {
5568	if (un.tag != .none) try mod.markReferencedDeclsAlive(un.tag.toValue());	5568	if (un.tag != .none) try mod.markReferencedDeclsAlive(Value.fromInterned(un.tag));
5569	try mod.markReferencedDeclsAlive(un.val.toValue());	5569	try mod.markReferencedDeclsAlive(Value.fromInterned(un.val));
5570	},	5570	},
5571	else => {},	5571	else => {},
5572	}	5572	}
...	@@ -5653,14 +5653,14 @@ pub fn intern(mod: *Module, key: InternPool.Key) Allocator.Error!InternPool.Inde	...	@@ -5653,14 +5653,14 @@ pub fn intern(mod: *Module, key: InternPool.Key) Allocator.Error!InternPool.Inde
5653		5653
5654	/// Shortcut for calling `intern_pool.getCoerced`.	5654	/// Shortcut for calling `intern_pool.getCoerced`.
5655	pub fn getCoerced(mod: *Module, val: Value, new_ty: Type) Allocator.Error!Value {	5655	pub fn getCoerced(mod: *Module, val: Value, new_ty: Type) Allocator.Error!Value {
5656	return (try mod.intern_pool.getCoerced(mod.gpa, val.toIntern(), new_ty.toIntern())).toValue();	5656	return Value.fromInterned((try mod.intern_pool.getCoerced(mod.gpa, val.toIntern(), new_ty.toIntern())));
5657	}	5657	}
5658		5658
5659	pub fn intType(mod: *Module, signedness: std.builtin.Signedness, bits: u16) Allocator.Error!Type {	5659	pub fn intType(mod: *Module, signedness: std.builtin.Signedness, bits: u16) Allocator.Error!Type {
5660	return (try intern(mod, .{ .int_type = .{	5660	return Type.fromInterned((try intern(mod, .{ .int_type = .{
5661	.signedness = signedness,	5661	.signedness = signedness,
5662	.bits = bits,	5662	.bits = bits,
5663	} })).toType();	5663	} })));
5664	}	5664	}
5665		5665
5666	pub fn errorIntType(mod: *Module) std.mem.Allocator.Error!Type {	5666	pub fn errorIntType(mod: *Module) std.mem.Allocator.Error!Type {
...	@@ -5669,17 +5669,17 @@ pub fn errorIntType(mod: *Module) std.mem.Allocator.Error!Type {	...	@@ -5669,17 +5669,17 @@ pub fn errorIntType(mod: *Module) std.mem.Allocator.Error!Type {
5669		5669
5670	pub fn arrayType(mod: *Module, info: InternPool.Key.ArrayType) Allocator.Error!Type {	5670	pub fn arrayType(mod: *Module, info: InternPool.Key.ArrayType) Allocator.Error!Type {
5671	const i = try intern(mod, .{ .array_type = info });	5671	const i = try intern(mod, .{ .array_type = info });
5672	return i.toType();	5672	return Type.fromInterned(i);
5673	}	5673	}
5674		5674
5675	pub fn vectorType(mod: *Module, info: InternPool.Key.VectorType) Allocator.Error!Type {	5675	pub fn vectorType(mod: *Module, info: InternPool.Key.VectorType) Allocator.Error!Type {
5676	const i = try intern(mod, .{ .vector_type = info });	5676	const i = try intern(mod, .{ .vector_type = info });
5677	return i.toType();	5677	return Type.fromInterned(i);
5678	}	5678	}
5679		5679
5680	pub fn optionalType(mod: *Module, child_type: InternPool.Index) Allocator.Error!Type {	5680	pub fn optionalType(mod: *Module, child_type: InternPool.Index) Allocator.Error!Type {
5681	const i = try intern(mod, .{ .opt_type = child_type });	5681	const i = try intern(mod, .{ .opt_type = child_type });
5682	return i.toType();	5682	return Type.fromInterned(i);
5683	}	5683	}
5684		5684
5685	pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type {	5685	pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type {
...	@@ -5692,7 +5692,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type	...	@@ -5692,7 +5692,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type
5692	// pointee type needs to be resolved more, that needs to be done before calling	5692	// pointee type needs to be resolved more, that needs to be done before calling
5693	// this ptr() function.	5693	// this ptr() function.
5694	if (info.flags.alignment != .none and	5694	if (info.flags.alignment != .none and
5695	info.flags.alignment == info.child.toType().abiAlignment(mod))	5695	info.flags.alignment == Type.fromInterned(info.child).abiAlignment(mod))
5696	{	5696	{
5697	canon_info.flags.alignment = .none;	5697	canon_info.flags.alignment = .none;
5698	}	5698	}
...	@@ -5702,7 +5702,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type	...	@@ -5702,7 +5702,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type
5702	// we change it to 0 here. If this causes an assertion trip, the pointee type	5702	// we change it to 0 here. If this causes an assertion trip, the pointee type
5703	// needs to be resolved before calling this ptr() function.	5703	// needs to be resolved before calling this ptr() function.
5704	.none => if (info.packed_offset.host_size != 0) {	5704	.none => if (info.packed_offset.host_size != 0) {
5705	const elem_bit_size = info.child.toType().bitSize(mod);	5705	const elem_bit_size = Type.fromInterned(info.child).bitSize(mod);
5706	assert(info.packed_offset.bit_offset + elem_bit_size <= info.packed_offset.host_size * 8);	5706	assert(info.packed_offset.bit_offset + elem_bit_size <= info.packed_offset.host_size * 8);
5707	if (info.packed_offset.host_size * 8 == elem_bit_size) {	5707	if (info.packed_offset.host_size * 8 == elem_bit_size) {
5708	canon_info.packed_offset.host_size = 0;	5708	canon_info.packed_offset.host_size = 0;
...	@@ -5712,7 +5712,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type	...	@@ -5712,7 +5712,7 @@ pub fn ptrType(mod: *Module, info: InternPool.Key.PtrType) Allocator.Error!Type
5712	_ => assert(@intFromEnum(info.flags.vector_index) < info.packed_offset.host_size),	5712	_ => assert(@intFromEnum(info.flags.vector_index) < info.packed_offset.host_size),
5713	}	5713	}
5714		5714
5715	return (try intern(mod, .{ .ptr_type = canon_info })).toType();	5715	return Type.fromInterned((try intern(mod, .{ .ptr_type = canon_info })));
5716	}	5716	}
5717		5717
5718	pub fn singleMutPtrType(mod: *Module, child_type: Type) Allocator.Error!Type {	5718	pub fn singleMutPtrType(mod: *Module, child_type: Type) Allocator.Error!Type {
...	@@ -5745,26 +5745,26 @@ pub fn adjustPtrTypeChild(mod: *Module, ptr_ty: Type, new_child: Type) Allocator	...	@@ -5745,26 +5745,26 @@ pub fn adjustPtrTypeChild(mod: *Module, ptr_ty: Type, new_child: Type) Allocator
5745	}	5745	}
5746		5746
5747	pub fn funcType(mod: *Module, key: InternPool.GetFuncTypeKey) Allocator.Error!Type {	5747	pub fn funcType(mod: *Module, key: InternPool.GetFuncTypeKey) Allocator.Error!Type {
5748	return (try mod.intern_pool.getFuncType(mod.gpa, key)).toType();	5748	return Type.fromInterned((try mod.intern_pool.getFuncType(mod.gpa, key)));
5749	}	5749	}
5750		5750
5751	/// Use this for `anyframe->T` only.	5751	/// Use this for `anyframe->T` only.
5752	/// For `anyframe`, use the `InternPool.Index.anyframe` tag directly.	5752	/// For `anyframe`, use the `InternPool.Index.anyframe` tag directly.
5753	pub fn anyframeType(mod: *Module, payload_ty: Type) Allocator.Error!Type {	5753	pub fn anyframeType(mod: *Module, payload_ty: Type) Allocator.Error!Type {
5754	return (try intern(mod, .{ .anyframe_type = payload_ty.toIntern() })).toType();	5754	return Type.fromInterned((try intern(mod, .{ .anyframe_type = payload_ty.toIntern() })));
5755	}	5755	}
5756		5756
5757	pub fn errorUnionType(mod: *Module, error_set_ty: Type, payload_ty: Type) Allocator.Error!Type {	5757	pub fn errorUnionType(mod: *Module, error_set_ty: Type, payload_ty: Type) Allocator.Error!Type {
5758	return (try intern(mod, .{ .error_union_type = .{	5758	return Type.fromInterned((try intern(mod, .{ .error_union_type = .{
5759	.error_set_type = error_set_ty.toIntern(),	5759	.error_set_type = error_set_ty.toIntern(),
5760	.payload_type = payload_ty.toIntern(),	5760	.payload_type = payload_ty.toIntern(),
5761	} })).toType();	5761	} })));
5762	}	5762	}
5763		5763
5764	pub fn singleErrorSetType(mod: *Module, name: InternPool.NullTerminatedString) Allocator.Error!Type {	5764	pub fn singleErrorSetType(mod: *Module, name: InternPool.NullTerminatedString) Allocator.Error!Type {
5765	const names: *const [1]InternPool.NullTerminatedString = &name;	5765	const names: *const [1]InternPool.NullTerminatedString = &name;
5766	const new_ty = try mod.intern_pool.getErrorSetType(mod.gpa, names);	5766	const new_ty = try mod.intern_pool.getErrorSetType(mod.gpa, names);
5767	return new_ty.toType();	5767	return Type.fromInterned(new_ty);
5768	}	5768	}
5769		5769
5770	/// Sorts `names` in place.	5770	/// Sorts `names` in place.
...	@@ -5779,7 +5779,7 @@ pub fn errorSetFromUnsortedNames(	...	@@ -5779,7 +5779,7 @@ pub fn errorSetFromUnsortedNames(
5779	InternPool.NullTerminatedString.indexLessThan,	5779	InternPool.NullTerminatedString.indexLessThan,
5780	);	5780	);
5781	const new_ty = try mod.intern_pool.getErrorSetType(mod.gpa, names);	5781	const new_ty = try mod.intern_pool.getErrorSetType(mod.gpa, names);
5782	return new_ty.toType();	5782	return Type.fromInterned(new_ty);
5783	}	5783	}
5784		5784
5785	/// Supports only pointers, not pointer-like optionals.	5785	/// Supports only pointers, not pointer-like optionals.
...	@@ -5789,7 +5789,7 @@ pub fn ptrIntValue(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {	...	@@ -5789,7 +5789,7 @@ pub fn ptrIntValue(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {
5789	.ty = ty.toIntern(),	5789	.ty = ty.toIntern(),
5790	.addr = .{ .int = (try mod.intValue_u64(Type.usize, x)).toIntern() },	5790	.addr = .{ .int = (try mod.intValue_u64(Type.usize, x)).toIntern() },
5791	} });	5791	} });
5792	return i.toValue();	5792	return Value.fromInterned(i);
5793	}	5793	}
5794		5794
5795	/// Creates an enum tag value based on the integer tag value.	5795	/// Creates an enum tag value based on the integer tag value.
...	@@ -5802,7 +5802,7 @@ pub fn enumValue(mod: *Module, ty: Type, tag_int: InternPool.Index) Allocator.Er	...	@@ -5802,7 +5802,7 @@ pub fn enumValue(mod: *Module, ty: Type, tag_int: InternPool.Index) Allocator.Er
5802	.ty = ty.toIntern(),	5802	.ty = ty.toIntern(),
5803	.int = tag_int,	5803	.int = tag_int,
5804	} });	5804	} });
5805	return i.toValue();	5805	return Value.fromInterned(i);
5806	}	5806	}
5807		5807
5808	/// Creates an enum tag value based on the field index according to source code	5808	/// Creates an enum tag value based on the field index according to source code
...	@@ -5814,23 +5814,23 @@ pub fn enumValueFieldIndex(mod: *Module, ty: Type, field_index: u32) Allocator.E	...	@@ -5814,23 +5814,23 @@ pub fn enumValueFieldIndex(mod: *Module, ty: Type, field_index: u32) Allocator.E
5814		5814
5815	if (enum_type.values.len == 0) {	5815	if (enum_type.values.len == 0) {
5816	// Auto-numbered fields.	5816	// Auto-numbered fields.
5817	return (try ip.get(gpa, .{ .enum_tag = .{	5817	return Value.fromInterned((try ip.get(gpa, .{ .enum_tag = .{
5818	.ty = ty.toIntern(),	5818	.ty = ty.toIntern(),
5819	.int = try ip.get(gpa, .{ .int = .{	5819	.int = try ip.get(gpa, .{ .int = .{
5820	.ty = enum_type.tag_ty,	5820	.ty = enum_type.tag_ty,
5821	.storage = .{ .u64 = field_index },	5821	.storage = .{ .u64 = field_index },
5822	} }),	5822	} }),
5823	} })).toValue();	5823	} })));
5824	}	5824	}
5825		5825
5826	return (try ip.get(gpa, .{ .enum_tag = .{	5826	return Value.fromInterned((try ip.get(gpa, .{ .enum_tag = .{
5827	.ty = ty.toIntern(),	5827	.ty = ty.toIntern(),
5828	.int = enum_type.values.get(ip)[field_index],	5828	.int = enum_type.values.get(ip)[field_index],
5829	} })).toValue();	5829	} })));
5830	}	5830	}
5831		5831
5832	pub fn undefValue(mod: *Module, ty: Type) Allocator.Error!Value {	5832	pub fn undefValue(mod: *Module, ty: Type) Allocator.Error!Value {
5833	return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();	5833	return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
5834	}	5834	}
5835		5835
5836	pub fn undefRef(mod: *Module, ty: Type) Allocator.Error!Air.Inst.Ref {	5836	pub fn undefRef(mod: *Module, ty: Type) Allocator.Error!Air.Inst.Ref {
...	@@ -5854,7 +5854,7 @@ pub fn intValue_big(mod: *Module, ty: Type, x: BigIntConst) Allocator.Error!Valu	...	@@ -5854,7 +5854,7 @@ pub fn intValue_big(mod: *Module, ty: Type, x: BigIntConst) Allocator.Error!Valu
5854	.ty = ty.toIntern(),	5854	.ty = ty.toIntern(),
5855	.storage = .{ .big_int = x },	5855	.storage = .{ .big_int = x },
5856	} });	5856	} });
5857	return i.toValue();	5857	return Value.fromInterned(i);
5858	}	5858	}
5859		5859
5860	pub fn intValue_u64(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {	5860	pub fn intValue_u64(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {
...	@@ -5862,7 +5862,7 @@ pub fn intValue_u64(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {	...	@@ -5862,7 +5862,7 @@ pub fn intValue_u64(mod: *Module, ty: Type, x: u64) Allocator.Error!Value {
5862	.ty = ty.toIntern(),	5862	.ty = ty.toIntern(),
5863	.storage = .{ .u64 = x },	5863	.storage = .{ .u64 = x },
5864	} });	5864	} });
5865	return i.toValue();	5865	return Value.fromInterned(i);
5866	}	5866	}
5867		5867
5868	pub fn intValue_i64(mod: *Module, ty: Type, x: i64) Allocator.Error!Value {	5868	pub fn intValue_i64(mod: *Module, ty: Type, x: i64) Allocator.Error!Value {
...	@@ -5870,7 +5870,7 @@ pub fn intValue_i64(mod: *Module, ty: Type, x: i64) Allocator.Error!Value {	...	@@ -5870,7 +5870,7 @@ pub fn intValue_i64(mod: *Module, ty: Type, x: i64) Allocator.Error!Value {
5870	.ty = ty.toIntern(),	5870	.ty = ty.toIntern(),
5871	.storage = .{ .i64 = x },	5871	.storage = .{ .i64 = x },
5872	} });	5872	} });
5873	return i.toValue();	5873	return Value.fromInterned(i);
5874	}	5874	}
5875		5875
5876	pub fn unionValue(mod: *Module, union_ty: Type, tag: Value, val: Value) Allocator.Error!Value {	5876	pub fn unionValue(mod: *Module, union_ty: Type, tag: Value, val: Value) Allocator.Error!Value {
...	@@ -5879,7 +5879,7 @@ pub fn unionValue(mod: *Module, union_ty: Type, tag: Value, val: Value) Allocato	...	@@ -5879,7 +5879,7 @@ pub fn unionValue(mod: *Module, union_ty: Type, tag: Value, val: Value) Allocato
5879	.tag = tag.toIntern(),	5879	.tag = tag.toIntern(),
5880	.val = val.toIntern(),	5880	.val = val.toIntern(),
5881	} });	5881	} });
5882	return i.toValue();	5882	return Value.fromInterned(i);
5883	}	5883	}
5884		5884
5885	/// This function casts the float representation down to the representation of the type, potentially	5885	/// This function casts the float representation down to the representation of the type, potentially
...	@@ -5897,7 +5897,7 @@ pub fn floatValue(mod: *Module, ty: Type, x: anytype) Allocator.Error!Value {	...	@@ -5897,7 +5897,7 @@ pub fn floatValue(mod: *Module, ty: Type, x: anytype) Allocator.Error!Value {
5897	.ty = ty.toIntern(),	5897	.ty = ty.toIntern(),
5898	.storage = storage,	5898	.storage = storage,
5899	} });	5899	} });
5900	return i.toValue();	5900	return Value.fromInterned(i);
5901	}	5901	}
5902		5902
5903	pub fn nullValue(mod: *Module, opt_ty: Type) Allocator.Error!Value {	5903	pub fn nullValue(mod: *Module, opt_ty: Type) Allocator.Error!Value {
...	@@ -5907,7 +5907,7 @@ pub fn nullValue(mod: *Module, opt_ty: Type) Allocator.Error!Value {	...	@@ -5907,7 +5907,7 @@ pub fn nullValue(mod: *Module, opt_ty: Type) Allocator.Error!Value {
5907	.ty = opt_ty.toIntern(),	5907	.ty = opt_ty.toIntern(),
5908	.val = .none,	5908	.val = .none,
5909	} });	5909	} });
5910	return result.toValue();	5910	return Value.fromInterned(result);
5911	}	5911	}
5912		5912
5913	pub fn smallestUnsignedInt(mod: *Module, max: u64) Allocator.Error!Type {	5913	pub fn smallestUnsignedInt(mod: *Module, max: u64) Allocator.Error!Type {
...	@@ -5964,10 +5964,10 @@ pub fn intBitsForValue(mod: *Module, val: Value, sign: bool) u16 {	...	@@ -5964,10 +5964,10 @@ pub fn intBitsForValue(mod: *Module, val: Value, sign: bool) u16 {
5964	return @as(u16, @intCast(big.bitCountTwosComp()));	5964	return @as(u16, @intCast(big.bitCountTwosComp()));
5965	},	5965	},
5966	.lazy_align => \|lazy_ty\| {	5966	.lazy_align => \|lazy_ty\| {
5967	return Type.smallestUnsignedBits(lazy_ty.toType().abiAlignment(mod).toByteUnits(0)) + @intFromBool(sign);	5967	return Type.smallestUnsignedBits(Type.fromInterned(lazy_ty).abiAlignment(mod).toByteUnits(0)) + @intFromBool(sign);
5968	},	5968	},
5969	.lazy_size => \|lazy_ty\| {	5969	.lazy_size => \|lazy_ty\| {
5970	return Type.smallestUnsignedBits(lazy_ty.toType().abiSize(mod)) + @intFromBool(sign);	5970	return Type.smallestUnsignedBits(Type.fromInterned(lazy_ty).abiSize(mod)) + @intFromBool(sign);
5971	},	5971	},
5972	}	5972	}
5973	}	5973	}
...	@@ -6252,14 +6252,14 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {	...	@@ -6252,14 +6252,14 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
6252	var payload_size: u64 = 0;	6252	var payload_size: u64 = 0;
6253	var payload_align: Alignment = .@"1";	6253	var payload_align: Alignment = .@"1";
6254	for (u.field_types.get(ip), 0..) \|field_ty, i\| {	6254	for (u.field_types.get(ip), 0..) \|field_ty, i\| {
6255	if (!field_ty.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	6255	if (!Type.fromInterned(field_ty).hasRuntimeBitsIgnoreComptime(mod)) continue;
6256		6256
6257	const explicit_align = u.fieldAlign(ip, @intCast(i));	6257	const explicit_align = u.fieldAlign(ip, @intCast(i));
6258	const field_align = if (explicit_align != .none)	6258	const field_align = if (explicit_align != .none)
6259	explicit_align	6259	explicit_align
6260	else	6260	else
6261	field_ty.toType().abiAlignment(mod);	6261	Type.fromInterned(field_ty).abiAlignment(mod);
6262	const field_size = field_ty.toType().abiSize(mod);	6262	const field_size = Type.fromInterned(field_ty).abiSize(mod);
6263	if (field_size > payload_size) {	6263	if (field_size > payload_size) {
6264	payload_size = field_size;	6264	payload_size = field_size;
6265	biggest_field = @intCast(i);	6265	biggest_field = @intCast(i);
...	@@ -6271,7 +6271,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {	...	@@ -6271,7 +6271,7 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
6271	}	6271	}
6272	}	6272	}
6273	const have_tag = u.flagsPtr(ip).runtime_tag.hasTag();	6273	const have_tag = u.flagsPtr(ip).runtime_tag.hasTag();
6274	if (!have_tag or !u.enum_tag_ty.toType().hasRuntimeBits(mod)) {	6274	if (!have_tag or !Type.fromInterned(u.enum_tag_ty).hasRuntimeBits(mod)) {
6275	return .{	6275	return .{
6276	.abi_size = payload_align.forward(payload_size),	6276	.abi_size = payload_align.forward(payload_size),
6277	.abi_align = payload_align,	6277	.abi_align = payload_align,
...	@@ -6286,8 +6286,8 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {	...	@@ -6286,8 +6286,8 @@ pub fn getUnionLayout(mod: *Module, u: InternPool.UnionType) UnionLayout {
6286	};	6286	};
6287	}	6287	}
6288		6288
6289	const tag_size = u.enum_tag_ty.toType().abiSize(mod);	6289	const tag_size = Type.fromInterned(u.enum_tag_ty).abiSize(mod);
6290	const tag_align = u.enum_tag_ty.toType().abiAlignment(mod).max(.@"1");	6290	const tag_align = Type.fromInterned(u.enum_tag_ty).abiAlignment(mod).max(.@"1");
6291	return .{	6291	return .{
6292	.abi_size = u.size,	6292	.abi_size = u.size,
6293	.abi_align = tag_align.max(payload_align),	6293	.abi_align = tag_align.max(payload_align),
...	@@ -6311,9 +6311,9 @@ pub fn unionAbiAlignment(mod: *Module, u: InternPool.UnionType) Alignment {	...	@@ -6311,9 +6311,9 @@ pub fn unionAbiAlignment(mod: *Module, u: InternPool.UnionType) Alignment {
6311	const ip = &mod.intern_pool;	6311	const ip = &mod.intern_pool;
6312	const have_tag = u.flagsPtr(ip).runtime_tag.hasTag();	6312	const have_tag = u.flagsPtr(ip).runtime_tag.hasTag();
6313	var max_align: Alignment = .none;	6313	var max_align: Alignment = .none;
6314	if (have_tag) max_align = u.enum_tag_ty.toType().abiAlignment(mod);	6314	if (have_tag) max_align = Type.fromInterned(u.enum_tag_ty).abiAlignment(mod);
6315	for (u.field_types.get(ip), 0..) \|field_ty, field_index\| {	6315	for (u.field_types.get(ip), 0..) \|field_ty, field_index\| {
6316	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	6316	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
6317		6317
6318	const field_align = mod.unionFieldNormalAlignment(u, @intCast(field_index));	6318	const field_align = mod.unionFieldNormalAlignment(u, @intCast(field_index));
6319	max_align = max_align.max(field_align);	6319	max_align = max_align.max(field_align);
...	@@ -6328,7 +6328,7 @@ pub fn unionFieldNormalAlignment(mod: *Module, u: InternPool.UnionType, field_in	...	@@ -6328,7 +6328,7 @@ pub fn unionFieldNormalAlignment(mod: *Module, u: InternPool.UnionType, field_in
6328	const ip = &mod.intern_pool;	6328	const ip = &mod.intern_pool;
6329	const field_align = u.fieldAlign(ip, field_index);	6329	const field_align = u.fieldAlign(ip, field_index);
6330	if (field_align != .none) return field_align;	6330	if (field_align != .none) return field_align;
6331	const field_ty = u.field_types.get(ip)[field_index].toType();	6331	const field_ty = Type.fromInterned(u.field_types.get(ip)[field_index]);
6332	return field_ty.abiAlignment(mod);	6332	return field_ty.abiAlignment(mod);
6333	}	6333	}
6334		6334
...	@@ -6396,7 +6396,7 @@ pub fn structPackedFieldBitOffset(	...	@@ -6396,7 +6396,7 @@ pub fn structPackedFieldBitOffset(
6396	if (i == field_index) {	6396	if (i == field_index) {
6397	return @intCast(bit_sum);	6397	return @intCast(bit_sum);
6398	}	6398	}
6399	const field_ty = struct_type.field_types.get(ip)[i].toType();	6399	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
6400	bit_sum += field_ty.bitSize(mod);	6400	bit_sum += field_ty.bitSize(mod);
6401	}	6401	}
6402	unreachable; // index out of bounds	6402	unreachable; // index out of bounds

src/RangeSet.zig+8-6

...	@@ -3,6 +3,8 @@ const assert = std.debug.assert;	...	@@ -3,6 +3,8 @@ const assert = std.debug.assert;
3	const Order = std.math.Order;	3	const Order = std.math.Order;
4		4
5	const InternPool = @import("InternPool.zig");	5	const InternPool = @import("InternPool.zig");
		6	const Type = @import("type.zig").Type;
		7	const Value = @import("value.zig").Value;
6	const Module = @import("Module.zig");	8	const Module = @import("Module.zig");
7	const RangeSet = @This();	9	const RangeSet = @This();
8	const SwitchProngSrc = @import("Module.zig").SwitchProngSrc;	10	const SwitchProngSrc = @import("Module.zig").SwitchProngSrc;
...	@@ -43,8 +45,8 @@ pub fn add(	...	@@ -43,8 +45,8 @@ pub fn add(
43	assert(ty == ip.typeOf(range.first));	45	assert(ty == ip.typeOf(range.first));
44	assert(ty == ip.typeOf(range.last));	46	assert(ty == ip.typeOf(range.last));
45		47
46	if (last.toValue().compareScalar(.gte, range.first.toValue(), ty.toType(), mod) and	48	if (Value.fromInterned(last).compareScalar(.gte, Value.fromInterned(range.first), Type.fromInterned(ty), mod) and
47	first.toValue().compareScalar(.lte, range.last.toValue(), ty.toType(), mod))	49	Value.fromInterned(first).compareScalar(.lte, Value.fromInterned(range.last), Type.fromInterned(ty), mod))
48	{	50	{
49	return range.src; // They overlap.	51	return range.src; // They overlap.
50	}	52	}
...	@@ -60,8 +62,8 @@ pub fn add(	...	@@ -60,8 +62,8 @@ pub fn add(
60		62
61	/// Assumes a and b do not overlap	63	/// Assumes a and b do not overlap
62	fn lessThan(mod: *Module, a: Range, b: Range) bool {	64	fn lessThan(mod: *Module, a: Range, b: Range) bool {
63	const ty = mod.intern_pool.typeOf(a.first).toType();	65	const ty = Type.fromInterned(mod.intern_pool.typeOf(a.first));
64	return a.first.toValue().compareScalar(.lt, b.first.toValue(), ty, mod);	66	return Value.fromInterned(a.first).compareScalar(.lt, Value.fromInterned(b.first), ty, mod);
65	}	67	}
66		68
67	pub fn spans(self: *RangeSet, first: InternPool.Index, last: InternPool.Index) !bool {	69	pub fn spans(self: *RangeSet, first: InternPool.Index, last: InternPool.Index) !bool {
...	@@ -91,10 +93,10 @@ pub fn spans(self: *RangeSet, first: InternPool.Index, last: InternPool.Index) !	...	@@ -91,10 +93,10 @@ pub fn spans(self: *RangeSet, first: InternPool.Index, last: InternPool.Index) !
91	const prev = self.ranges.items[i];	93	const prev = self.ranges.items[i];
92		94
93	// prev.last + 1 == cur.first	95	// prev.last + 1 == cur.first
94	try counter.copy(prev.last.toValue().toBigInt(&space, mod));	96	try counter.copy(Value.fromInterned(prev.last).toBigInt(&space, mod));
95	try counter.addScalar(&counter, 1);	97	try counter.addScalar(&counter, 1);
96		98
97	const cur_start_int = cur.first.toValue().toBigInt(&space, mod);	99	const cur_start_int = Value.fromInterned(cur.first).toBigInt(&space, mod);
98	if (!cur_start_int.eql(counter.toConst())) {	100	if (!cur_start_int.eql(counter.toConst())) {
99	return false;	101	return false;
100	}	102	}

src/Sema.zig+424-424

...	@@ -2153,13 +2153,13 @@ fn resolveValueAllowVariables(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Val	...	@@ -2153,13 +2153,13 @@ fn resolveValueAllowVariables(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Val
2153	assert(inst != .none);	2153	assert(inst != .none);
2154	// First section of indexes correspond to a set number of constant values.	2154	// First section of indexes correspond to a set number of constant values.
2155	if (@intFromEnum(inst) < InternPool.static_len) {	2155	if (@intFromEnum(inst) < InternPool.static_len) {
2156	return @as(InternPool.Index, @enumFromInt(@intFromEnum(inst))).toValue();	2156	return Value.fromInterned(@as(InternPool.Index, @enumFromInt(@intFromEnum(inst))));
2157	}	2157	}
2158		2158
2159	const air_tags = sema.air_instructions.items(.tag);	2159	const air_tags = sema.air_instructions.items(.tag);
2160	if (try sema.typeHasOnePossibleValue(sema.typeOf(inst))) \|opv\| {	2160	if (try sema.typeHasOnePossibleValue(sema.typeOf(inst))) \|opv\| {
2161	if (Air.refToInterned(inst)) \|ip_index\| {	2161	if (Air.refToInterned(inst)) \|ip_index\| {
2162	const val = ip_index.toValue();	2162	const val = Value.fromInterned(ip_index);
2163	if (val.getVariable(sema.mod) != null) return val;	2163	if (val.getVariable(sema.mod) != null) return val;
2164	}	2164	}
2165	return opv;	2165	return opv;
...	@@ -2171,7 +2171,7 @@ fn resolveValueAllowVariables(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Val	...	@@ -2171,7 +2171,7 @@ fn resolveValueAllowVariables(sema: *Sema, inst: Air.Inst.Ref) CompileError!?Val
2171	else => return null,	2171	else => return null,
2172	}	2172	}
2173	};	2173	};
2174	const val = ip_index.toValue();	2174	const val = Value.fromInterned(ip_index);
2175	if (val.isPtrToThreadLocal(sema.mod)) return null;	2175	if (val.isPtrToThreadLocal(sema.mod)) return null;
2176	return val;	2176	return val;
2177	}	2177	}
...	@@ -2364,7 +2364,7 @@ fn typeSupportsFieldAccess(mod: *const Module, ty: Type, field_name: InternPool.	...	@@ -2364,7 +2364,7 @@ fn typeSupportsFieldAccess(mod: *const Module, ty: Type, field_name: InternPool.
2364	const ptr_info = ty.ptrInfo(mod);	2364	const ptr_info = ty.ptrInfo(mod);
2365	if (ptr_info.flags.size == .Slice) {	2365	if (ptr_info.flags.size == .Slice) {
2366	return ip.stringEqlSlice(field_name, "ptr") or ip.stringEqlSlice(field_name, "len");	2366	return ip.stringEqlSlice(field_name, "ptr") or ip.stringEqlSlice(field_name, "len");
2367	} else if (ptr_info.child.toType().zigTypeTag(mod) == .Array) {	2367	} else if (Type.fromInterned(ptr_info.child).zigTypeTag(mod) == .Array) {
2368	return ip.stringEqlSlice(field_name, "len");	2368	return ip.stringEqlSlice(field_name, "len");
2369	} else return false;	2369	} else return false;
2370	},	2370	},
...	@@ -2752,8 +2752,8 @@ fn zirStructDecl(	...	@@ -2752,8 +2752,8 @@ fn zirStructDecl(
2752	//errdefer ip.remove(struct_ty);	2752	//errdefer ip.remove(struct_ty);
2753		2753
2754	new_decl.ty = Type.type;	2754	new_decl.ty = Type.type;
2755	new_decl.val = struct_ty.toValue();	2755	new_decl.val = Value.fromInterned(struct_ty);
2756	new_namespace.ty = struct_ty.toType();	2756	new_namespace.ty = Type.fromInterned(struct_ty);
2757		2757
2758	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);	2758	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);
2759	try mod.finalizeAnonDecl(new_decl_index);	2759	try mod.finalizeAnonDecl(new_decl_index);
...	@@ -2959,8 +2959,8 @@ fn zirEnumDecl(	...	@@ -2959,8 +2959,8 @@ fn zirEnumDecl(
2959	//errdefer if (!done) mod.intern_pool.remove(incomplete_enum.index);	2959	//errdefer if (!done) mod.intern_pool.remove(incomplete_enum.index);
2960		2960
2961	new_decl.ty = Type.type;	2961	new_decl.ty = Type.type;
2962	new_decl.val = incomplete_enum.index.toValue();	2962	new_decl.val = Value.fromInterned(incomplete_enum.index);
2963	new_namespace.ty = incomplete_enum.index.toType();	2963	new_namespace.ty = Type.fromInterned(incomplete_enum.index);
2964		2964
2965	const decl_val = try sema.analyzeDeclVal(block, src, new_decl_index);	2965	const decl_val = try sema.analyzeDeclVal(block, src, new_decl_index);
2966	try mod.finalizeAnonDecl(new_decl_index);	2966	try mod.finalizeAnonDecl(new_decl_index);
...	@@ -3222,8 +3222,8 @@ fn zirUnionDecl(	...	@@ -3222,8 +3222,8 @@ fn zirUnionDecl(
3222	//errdefer mod.intern_pool.remove(union_ty);	3222	//errdefer mod.intern_pool.remove(union_ty);
3223		3223
3224	new_decl.ty = Type.type;	3224	new_decl.ty = Type.type;
3225	new_decl.val = union_ty.toValue();	3225	new_decl.val = Value.fromInterned(union_ty);
3226	new_namespace.ty = union_ty.toType();	3226	new_namespace.ty = Type.fromInterned(union_ty);
3227		3227
3228	_ = try mod.scanNamespace(new_namespace_index, extra_index, decls_len, new_decl);	3228	_ = try mod.scanNamespace(new_namespace_index, extra_index, decls_len, new_decl);
3229		3229
...	@@ -3285,8 +3285,8 @@ fn zirOpaqueDecl(	...	@@ -3285,8 +3285,8 @@ fn zirOpaqueDecl(
3285	//errdefer mod.intern_pool.remove(opaque_ty);	3285	//errdefer mod.intern_pool.remove(opaque_ty);
3286		3286
3287	new_decl.ty = Type.type;	3287	new_decl.ty = Type.type;
3288	new_decl.val = opaque_ty.toValue();	3288	new_decl.val = Value.fromInterned(opaque_ty);
3289	new_namespace.ty = opaque_ty.toType();	3289	new_namespace.ty = Type.fromInterned(opaque_ty);
3290		3290
3291	extra_index = try mod.scanNamespace(new_namespace_index, extra_index, decls_len, new_decl);	3291	extra_index = try mod.scanNamespace(new_namespace_index, extra_index, decls_len, new_decl);
3292		3292
...	@@ -3600,7 +3600,7 @@ fn zirMakePtrConst(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileErro	...	@@ -3600,7 +3600,7 @@ fn zirMakePtrConst(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileErro
3600	const alloc = try sema.resolveInst(inst_data.operand);	3600	const alloc = try sema.resolveInst(inst_data.operand);
3601	const alloc_ty = sema.typeOf(alloc);	3601	const alloc_ty = sema.typeOf(alloc);
3602	const ptr_info = alloc_ty.ptrInfo(mod);	3602	const ptr_info = alloc_ty.ptrInfo(mod);
3603	const elem_ty = ptr_info.child.toType();	3603	const elem_ty = Type.fromInterned(ptr_info.child);
3604		3604
3605	if (try sema.resolveComptimeKnownAllocValue(block, alloc, null)) \|val\| {	3605	if (try sema.resolveComptimeKnownAllocValue(block, alloc, null)) \|val\| {
3606	const new_mut_ptr = Air.internedToRef((try mod.intern(.{ .ptr = .{	3606	const new_mut_ptr = Air.internedToRef((try mod.intern(.{ .ptr = .{
...	@@ -3652,7 +3652,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re	...	@@ -3652,7 +3652,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re
3652		3652
3653	const alloc_ty = resolved_alloc_ty orelse sema.typeOf(alloc);	3653	const alloc_ty = resolved_alloc_ty orelse sema.typeOf(alloc);
3654	const ptr_info = alloc_ty.ptrInfo(mod);	3654	const ptr_info = alloc_ty.ptrInfo(mod);
3655	const elem_ty = ptr_info.child.toType();	3655	const elem_ty = Type.fromInterned(ptr_info.child);
3656		3656
3657	const alloc_inst = Air.refToIndex(alloc) orelse return null;	3657	const alloc_inst = Air.refToIndex(alloc) orelse return null;
3658	const comptime_info = sema.maybe_comptime_allocs.fetchRemove(alloc_inst) orelse return null;	3658	const comptime_info = sema.maybe_comptime_allocs.fetchRemove(alloc_inst) orelse return null;
...	@@ -3803,7 +3803,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re	...	@@ -3803,7 +3803,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re
3803	.index = field_idx,	3803	.index = field_idx,
3804	} },	3804	} },
3805	} }),	3805	} }),
3806	.elem => \|elem_idx\| (try decl_parent_ptr.toValue().elemPtr(new_ptr_ty.toType(), @intCast(elem_idx), mod)).toIntern(),	3806	.elem => \|elem_idx\| (try Value.fromInterned(decl_parent_ptr).elemPtr(Type.fromInterned(new_ptr_ty), @intCast(elem_idx), mod)).toIntern(),
3807	};	3807	};
3808	try ptr_mapping.put(air_ptr, new_ptr);	3808	try ptr_mapping.put(air_ptr, new_ptr);
3809	}	3809	}
...	@@ -3823,7 +3823,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re	...	@@ -3823,7 +3823,7 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re
3823	if (try sema.typeHasOnePossibleValue(payload_ty)) \|payload_val\| {	3823	if (try sema.typeHasOnePossibleValue(payload_ty)) \|payload_val\| {
3824	const new_ptr = ptr_mapping.get(air_ptr_inst).?;	3824	const new_ptr = ptr_mapping.get(air_ptr_inst).?;
3825	const store_val = try mod.unionValue(union_ty, tag_val, payload_val);	3825	const store_val = try mod.unionValue(union_ty, tag_val, payload_val);
3826	try sema.storePtrVal(block, .unneeded, new_ptr.toValue(), store_val, union_ty);	3826	try sema.storePtrVal(block, .unneeded, Value.fromInterned(new_ptr), store_val, union_ty);
3827	}	3827	}
3828	},	3828	},
3829	.store, .store_safe => {	3829	.store, .store_safe => {
...	@@ -3831,14 +3831,14 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re	...	@@ -3831,14 +3831,14 @@ fn resolveComptimeKnownAllocValue(sema: Sema, block: Block, alloc: Air.Inst.Re
3831	const air_ptr_inst = Air.refToIndex(bin_op.lhs).?;	3831	const air_ptr_inst = Air.refToIndex(bin_op.lhs).?;
3832	const store_val = (try sema.resolveValue(bin_op.rhs)).?;	3832	const store_val = (try sema.resolveValue(bin_op.rhs)).?;
3833	const new_ptr = ptr_mapping.get(air_ptr_inst).?;	3833	const new_ptr = ptr_mapping.get(air_ptr_inst).?;
3834	try sema.storePtrVal(block, .unneeded, new_ptr.toValue(), store_val, mod.intern_pool.typeOf(store_val.toIntern()).toType());	3834	try sema.storePtrVal(block, .unneeded, Value.fromInterned(new_ptr), store_val, Type.fromInterned(mod.intern_pool.typeOf(store_val.toIntern())));
3835	},	3835	},
3836	else => unreachable,	3836	else => unreachable,
3837	}	3837	}
3838	}	3838	}
3839		3839
3840	// The value is finalized - load it!	3840	// The value is finalized - load it!
3841	const val = (try sema.pointerDeref(block, .unneeded, decl_ptr.toValue(), alloc_ty)).?.toIntern();	3841	const val = (try sema.pointerDeref(block, .unneeded, Value.fromInterned(decl_ptr), alloc_ty)).?.toIntern();
3842	return sema.finishResolveComptimeKnownAllocValue(val, alloc_inst, comptime_info.value);	3842	return sema.finishResolveComptimeKnownAllocValue(val, alloc_inst, comptime_info.value);
3843	}	3843	}
3844		3844
...	@@ -6757,8 +6757,8 @@ fn checkCallArgumentCount(	...	@@ -6757,8 +6757,8 @@ fn checkCallArgumentCount(
6757	.Fn => break :func_ty callee_ty,	6757	.Fn => break :func_ty callee_ty,
6758	.Pointer => {	6758	.Pointer => {
6759	const ptr_info = callee_ty.ptrInfo(mod);	6759	const ptr_info = callee_ty.ptrInfo(mod);
6760	if (ptr_info.flags.size == .One and ptr_info.child.toType().zigTypeTag(mod) == .Fn) {	6760	if (ptr_info.flags.size == .One and Type.fromInterned(ptr_info.child).zigTypeTag(mod) == .Fn) {
6761	break :func_ty ptr_info.child.toType();	6761	break :func_ty Type.fromInterned(ptr_info.child);
6762	}	6762	}
6763	},	6763	},
6764	.Optional => {	6764	.Optional => {
...	@@ -6831,8 +6831,8 @@ fn callBuiltin(	...	@@ -6831,8 +6831,8 @@ fn callBuiltin(
6831	.Fn => break :func_ty callee_ty,	6831	.Fn => break :func_ty callee_ty,
6832	.Pointer => {	6832	.Pointer => {
6833	const ptr_info = callee_ty.ptrInfo(mod);	6833	const ptr_info = callee_ty.ptrInfo(mod);
6834	if (ptr_info.flags.size == .One and ptr_info.child.toType().zigTypeTag(mod) == .Fn) {	6834	if (ptr_info.flags.size == .One and Type.fromInterned(ptr_info.child).zigTypeTag(mod) == .Fn) {
6835	break :func_ty ptr_info.child.toType();	6835	break :func_ty Type.fromInterned(ptr_info.child);
6836	}	6836	}
6837	},	6837	},
6838	else => {},	6838	else => {},
...	@@ -7179,14 +7179,14 @@ fn analyzeCall(	...	@@ -7179,14 +7179,14 @@ fn analyzeCall(
7179	var is_comptime_call = block.is_comptime or modifier == .compile_time;	7179	var is_comptime_call = block.is_comptime or modifier == .compile_time;
7180	var comptime_reason: ?*const Block.ComptimeReason = null;	7180	var comptime_reason: ?*const Block.ComptimeReason = null;
7181	if (!is_comptime_call) {	7181	if (!is_comptime_call) {
7182	if (sema.typeRequiresComptime(func_ty_info.return_type.toType())) \|ct\| {	7182	if (sema.typeRequiresComptime(Type.fromInterned(func_ty_info.return_type))) \|ct\| {
7183	is_comptime_call = ct;	7183	is_comptime_call = ct;
7184	if (ct) {	7184	if (ct) {
7185	comptime_reason = &.{ .comptime_ret_ty = .{	7185	comptime_reason = &.{ .comptime_ret_ty = .{
7186	.block = block,	7186	.block = block,
7187	.func = func,	7187	.func = func,
7188	.func_src = func_src,	7188	.func_src = func_src,
7189	.return_ty = func_ty_info.return_type.toType(),	7189	.return_ty = Type.fromInterned(func_ty_info.return_type),
7190	} };	7190	} };
7191	}	7191	}
7192	} else \|err\| switch (err) {	7192	} else \|err\| switch (err) {
...	@@ -7234,7 +7234,7 @@ fn analyzeCall(	...	@@ -7234,7 +7234,7 @@ fn analyzeCall(
7234	.block = block,	7234	.block = block,
7235	.func = func,	7235	.func = func,
7236	.func_src = func_src,	7236	.func_src = func_src,
7237	.return_ty = func_ty_info.return_type.toType(),	7237	.return_ty = Type.fromInterned(func_ty_info.return_type),
7238	} };	7238	} };
7239	},	7239	},
7240	else => \|e\| return e,	7240	else => \|e\| return e,
...	@@ -7431,10 +7431,10 @@ fn analyzeCall(	...	@@ -7431,10 +7431,10 @@ fn analyzeCall(
7431	const ies = try sema.arena.create(InferredErrorSet);	7431	const ies = try sema.arena.create(InferredErrorSet);
7432	ies.* = .{ .func = .none };	7432	ies.* = .{ .func = .none };
7433	sema.fn_ret_ty_ies = ies;	7433	sema.fn_ret_ty_ies = ies;
7434	sema.fn_ret_ty = (try ip.get(gpa, .{ .error_union_type = .{	7434	sema.fn_ret_ty = Type.fromInterned((try ip.get(gpa, .{ .error_union_type = .{
7435	.error_set_type = .adhoc_inferred_error_set_type,	7435	.error_set_type = .adhoc_inferred_error_set_type,
7436	.payload_type = sema.fn_ret_ty.toIntern(),	7436	.payload_type = sema.fn_ret_ty.toIntern(),
7437	} })).toType();	7437	} })));
7438	}	7438	}
7439		7439
7440	// This `res2` is here instead of directly breaking from `res` due to a stage1	7440	// This `res2` is here instead of directly breaking from `res` due to a stage1
...	@@ -7529,7 +7529,7 @@ fn analyzeCall(	...	@@ -7529,7 +7529,7 @@ fn analyzeCall(
7529	if (new_ty != .none) {	7529	if (new_ty != .none) {
7530	// TODO: mutate in place the previous instruction if possible	7530	// TODO: mutate in place the previous instruction if possible
7531	// rather than adding a bitcast instruction.	7531	// rather than adding a bitcast instruction.
7532	break :res2 try block.addBitCast(new_ty.toType(), result);	7532	break :res2 try block.addBitCast(Type.fromInterned(new_ty), result);
7533	}	7533	}
7534		7534
7535	break :res2 result;	7535	break :res2 result;
...	@@ -7543,8 +7543,8 @@ fn analyzeCall(	...	@@ -7543,8 +7543,8 @@ fn analyzeCall(
7543	for (args, 0..) \|*arg_out, arg_idx\| {	7543	for (args, 0..) \|*arg_out, arg_idx\| {
7544	// Non-generic, so param types are already resolved	7544	// Non-generic, so param types are already resolved
7545	const param_ty = if (arg_idx < func_ty_info.param_types.len) ty: {	7545	const param_ty = if (arg_idx < func_ty_info.param_types.len) ty: {
7546	break :ty func_ty_info.param_types.get(ip)[arg_idx].toType();	7546	break :ty Type.fromInterned(func_ty_info.param_types.get(ip)[arg_idx]);
7547	} else InternPool.Index.var_args_param_type.toType();	7547	} else Type.fromInterned(InternPool.Index.var_args_param_type);
7548	assert(!param_ty.isGenericPoison());	7548	assert(!param_ty.isGenericPoison());
7549	arg_out.* = try args_info.analyzeArg(sema, block, arg_idx, param_ty, func_ty_info, func);	7549	arg_out.* = try args_info.analyzeArg(sema, block, arg_idx, param_ty, func_ty_info, func);
7550	if (sema.typeOf(arg_out.*).zigTypeTag(mod) == .NoReturn) {	7550	if (sema.typeOf(arg_out.*).zigTypeTag(mod) == .NoReturn) {
...	@@ -7554,8 +7554,8 @@ fn analyzeCall(	...	@@ -7554,8 +7554,8 @@ fn analyzeCall(
7554		7554
7555	if (call_dbg_node) \|some\| try sema.zirDbgStmt(block, some);	7555	if (call_dbg_node) \|some\| try sema.zirDbgStmt(block, some);
7556		7556
7557	try sema.queueFullTypeResolution(func_ty_info.return_type.toType());	7557	try sema.queueFullTypeResolution(Type.fromInterned(func_ty_info.return_type));
7558	if (sema.owner_func_index != .none and func_ty_info.return_type.toType().isError(mod)) {	7558	if (sema.owner_func_index != .none and Type.fromInterned(func_ty_info.return_type).isError(mod)) {
7559	ip.funcAnalysis(sema.owner_func_index).calls_or_awaits_errorable_fn = true;	7559	ip.funcAnalysis(sema.owner_func_index).calls_or_awaits_errorable_fn = true;
7560	}	7560	}
7561		7561
...	@@ -7670,12 +7670,12 @@ fn analyzeInlineCallArg(	...	@@ -7670,12 +7670,12 @@ fn analyzeInlineCallArg(
7670	break :param_ty param_ty.toIntern();	7670	break :param_ty param_ty.toIntern();
7671	};	7671	};
7672	new_param_types[arg_i.*] = param_ty;	7672	new_param_types[arg_i.*] = param_ty;
7673	const casted_arg = try args_info.analyzeArg(ics.caller(), arg_block, arg_i.*, param_ty.toType(), func_ty_info, func_inst);	7673	const casted_arg = try args_info.analyzeArg(ics.caller(), arg_block, arg_i.*, Type.fromInterned(param_ty), func_ty_info, func_inst);
7674	if (ics.caller().typeOf(casted_arg).zigTypeTag(mod) == .NoReturn) {	7674	if (ics.caller().typeOf(casted_arg).zigTypeTag(mod) == .NoReturn) {
7675	return casted_arg;	7675	return casted_arg;
7676	}	7676	}
7677	const arg_src = args_info.argSrc(arg_block, arg_i.*);	7677	const arg_src = args_info.argSrc(arg_block, arg_i.*);
7678	if (try ics.callee().typeRequiresComptime(param_ty.toType())) {	7678	if (try ics.callee().typeRequiresComptime(Type.fromInterned(param_ty))) {
7679	_ = try ics.caller().resolveConstValue(arg_block, arg_src, casted_arg, .{	7679	_ = try ics.caller().resolveConstValue(arg_block, arg_src, casted_arg, .{
7680	.needed_comptime_reason = "argument to parameter with comptime-only type must be comptime-known",	7680	.needed_comptime_reason = "argument to parameter with comptime-only type must be comptime-known",
7681	.block_comptime_reason = param_block.comptime_reason,	7681	.block_comptime_reason = param_block.comptime_reason,
...	@@ -7705,7 +7705,7 @@ fn analyzeInlineCallArg(	...	@@ -7705,7 +7705,7 @@ fn analyzeInlineCallArg(
7705	// when the hash function is called.	7705	// when the hash function is called.
7706	const resolved_arg_val = try ics.caller().resolveLazyValue(arg_val);	7706	const resolved_arg_val = try ics.caller().resolveLazyValue(arg_val);
7707	should_memoize.* = should_memoize.* and !resolved_arg_val.canMutateComptimeVarState(mod);	7707	should_memoize.* = should_memoize.* and !resolved_arg_val.canMutateComptimeVarState(mod);
7708	memoized_arg_values[arg_i.*] = try resolved_arg_val.intern(param_ty.toType(), mod);	7708	memoized_arg_values[arg_i.*] = try resolved_arg_val.intern(Type.fromInterned(param_ty), mod);
7709	} else {	7709	} else {
7710	ics.callee().inst_map.putAssumeCapacityNoClobber(inst, casted_arg);	7710	ics.callee().inst_map.putAssumeCapacityNoClobber(inst, casted_arg);
7711	}	7711	}
...	@@ -7790,7 +7790,7 @@ fn instantiateGenericCall(	...	@@ -7790,7 +7790,7 @@ fn instantiateGenericCall(
7790	else => unreachable,	7790	else => unreachable,
7791	};	7791	};
7792	const generic_owner_func = mod.intern_pool.indexToKey(generic_owner).func;	7792	const generic_owner_func = mod.intern_pool.indexToKey(generic_owner).func;
7793	const generic_owner_ty_info = mod.typeToFunc(generic_owner_func.ty.toType()).?;	7793	const generic_owner_ty_info = mod.typeToFunc(Type.fromInterned(generic_owner_func.ty)).?;
7794		7794
7795	// Even though there may already be a generic instantiation corresponding	7795	// Even though there may already be a generic instantiation corresponding
7796	// to this callsite, we must evaluate the expressions of the generic	7796	// to this callsite, we must evaluate the expressions of the generic
...	@@ -7862,7 +7862,7 @@ fn instantiateGenericCall(	...	@@ -7862,7 +7862,7 @@ fn instantiateGenericCall(
7862	const param_tag = fn_zir.instructions.items(.tag)[@intFromEnum(param_inst)];	7862	const param_tag = fn_zir.instructions.items(.tag)[@intFromEnum(param_inst)];
7863		7863
7864	const param_ty = switch (generic_owner_ty_info.param_types.get(ip)[arg_index]) {	7864	const param_ty = switch (generic_owner_ty_info.param_types.get(ip)[arg_index]) {
7865	else => \|ty\| ty.toType(), // parameter is not generic, so type is already resolved	7865	else => \|ty\| Type.fromInterned(ty), // parameter is not generic, so type is already resolved
7866	.generic_poison_type => param_ty: {	7866	.generic_poison_type => param_ty: {
7867	// We have every parameter before this one, so can resolve this parameter's type now.	7867	// We have every parameter before this one, so can resolve this parameter's type now.
7868	// However, first check the param type, since it may be anytype.	7868	// However, first check the param type, since it may be anytype.
...	@@ -7998,12 +7998,12 @@ fn instantiateGenericCall(	...	@@ -7998,12 +7998,12 @@ fn instantiateGenericCall(
7998	try sema.addReferencedBy(block, call_src, callee.owner_decl);	7998	try sema.addReferencedBy(block, call_src, callee.owner_decl);
7999		7999
8000	// Make a runtime call to the new function, making sure to omit the comptime args.	8000	// Make a runtime call to the new function, making sure to omit the comptime args.
8001	const func_ty = callee.ty.toType();	8001	const func_ty = Type.fromInterned(callee.ty);
8002	const func_ty_info = mod.typeToFunc(func_ty).?;	8002	const func_ty_info = mod.typeToFunc(func_ty).?;
8003		8003
8004	// If the call evaluated to a return type that requires comptime, never mind	8004	// If the call evaluated to a return type that requires comptime, never mind
8005	// our generic instantiation. Instead we need to perform a comptime call.	8005	// our generic instantiation. Instead we need to perform a comptime call.
8006	if (try sema.typeRequiresComptime(func_ty_info.return_type.toType())) {	8006	if (try sema.typeRequiresComptime(Type.fromInterned(func_ty_info.return_type))) {
8007	return error.ComptimeReturn;	8007	return error.ComptimeReturn;
8008	}	8008	}
8009	// Similarly, if the call evaluated to a generic type we need to instead	8009	// Similarly, if the call evaluated to a generic type we need to instead
...	@@ -8012,12 +8012,12 @@ fn instantiateGenericCall(	...	@@ -8012,12 +8012,12 @@ fn instantiateGenericCall(
8012	return error.GenericPoison;	8012	return error.GenericPoison;
8013	}	8013	}
8014		8014
8015	try sema.queueFullTypeResolution(func_ty_info.return_type.toType());	8015	try sema.queueFullTypeResolution(Type.fromInterned(func_ty_info.return_type));
8016		8016
8017	if (call_dbg_node) \|some\| try sema.zirDbgStmt(block, some);	8017	if (call_dbg_node) \|some\| try sema.zirDbgStmt(block, some);
8018		8018
8019	if (sema.owner_func_index != .none and	8019	if (sema.owner_func_index != .none and
8020	func_ty_info.return_type.toType().isError(mod))	8020	Type.fromInterned(func_ty_info.return_type).isError(mod))
8021	{	8021	{
8022	ip.funcAnalysis(sema.owner_func_index).calls_or_awaits_errorable_fn = true;	8022	ip.funcAnalysis(sema.owner_func_index).calls_or_awaits_errorable_fn = true;
8023	}	8023	}
...	@@ -8057,10 +8057,10 @@ fn resolveTupleLazyValues(sema: Sema, block: Block, src: LazySrcLoc, ty: Type)	...	@@ -8057,10 +8057,10 @@ fn resolveTupleLazyValues(sema: Sema, block: Block, src: LazySrcLoc, ty: Type)
8057	else => return,	8057	else => return,
8058	};	8058	};
8059	for (tuple.types.get(ip), tuple.values.get(ip)) \|field_ty, field_val\| {	8059	for (tuple.types.get(ip), tuple.values.get(ip)) \|field_ty, field_val\| {
8060	try sema.resolveTupleLazyValues(block, src, field_ty.toType());	8060	try sema.resolveTupleLazyValues(block, src, Type.fromInterned(field_ty));
8061	if (field_val == .none) continue;	8061	if (field_val == .none) continue;
8062	// TODO: mutate in intern pool	8062	// TODO: mutate in intern pool
8063	_ = try sema.resolveLazyValue(field_val.toValue());	8063	_ = try sema.resolveLazyValue(Value.fromInterned(field_val));
8064	}	8064	}
8065	}	8065	}
8066		8066
...	@@ -9217,7 +9217,7 @@ fn funcCommon(	...	@@ -9217,7 +9217,7 @@ fn funcCommon(
9217	const cc_resolved = cc orelse .Unspecified;	9217	const cc_resolved = cc orelse .Unspecified;
9218	var comptime_bits: u32 = 0;	9218	var comptime_bits: u32 = 0;
9219	for (block.params.items(.ty), block.params.items(.is_comptime), 0..) \|param_ty_ip, param_is_comptime, i\| {	9219	for (block.params.items(.ty), block.params.items(.is_comptime), 0..) \|param_ty_ip, param_is_comptime, i\| {
9220	const param_ty = param_ty_ip.toType();	9220	const param_ty = Type.fromInterned(param_ty_ip);
9221	const is_noalias = blk: {	9221	const is_noalias = blk: {
9222	const index = std.math.cast(u5, i) orelse break :blk false;	9222	const index = std.math.cast(u5, i) orelse break :blk false;
9223	break :blk @as(u1, @truncate(noalias_bits >> index)) != 0;	9223	break :blk @as(u1, @truncate(noalias_bits >> index)) != 0;
...	@@ -9529,7 +9529,7 @@ fn finishFunc(	...	@@ -9529,7 +9529,7 @@ fn finishFunc(
9529	const return_type: Type = if (opt_func_index == .none or ret_poison)	9529	const return_type: Type = if (opt_func_index == .none or ret_poison)
9530	bare_return_type	9530	bare_return_type
9531	else	9531	else
9532	ip.funcTypeReturnType(ip.typeOf(opt_func_index)).toType();	9532	Type.fromInterned(ip.funcTypeReturnType(ip.typeOf(opt_func_index)));
9533		9533
9534	if (!return_type.isValidReturnType(mod)) {	9534	if (!return_type.isValidReturnType(mod)) {
9535	const opaque_str = if (return_type.zigTypeTag(mod) == .Opaque) "opaque " else "";	9535	const opaque_str = if (return_type.zigTypeTag(mod) == .Opaque) "opaque " else "";
...	@@ -10078,10 +10078,10 @@ fn intCast(	...	@@ -10078,10 +10078,10 @@ fn intCast(
10078	// range to account for negative values.	10078	// range to account for negative values.
10079	const dest_range_val = if (wanted_info.signedness == .signed) range_val: {	10079	const dest_range_val = if (wanted_info.signedness == .signed) range_val: {
10080	const one_scalar = try mod.intValue(unsigned_scalar_operand_ty, 1);	10080	const one_scalar = try mod.intValue(unsigned_scalar_operand_ty, 1);
10081	const one = if (is_vector) (try mod.intern(.{ .aggregate = .{	10081	const one = if (is_vector) Value.fromInterned((try mod.intern(.{ .aggregate = .{
10082	.ty = unsigned_operand_ty.toIntern(),	10082	.ty = unsigned_operand_ty.toIntern(),
10083	.storage = .{ .repeated_elem = one_scalar.toIntern() },	10083	.storage = .{ .repeated_elem = one_scalar.toIntern() },
10084	} })).toValue() else one_scalar;	10084	} }))) else one_scalar;
10085	const range_minus_one = try dest_max_val.shl(one, unsigned_operand_ty, sema.arena, mod);	10085	const range_minus_one = try dest_max_val.shl(one, unsigned_operand_ty, sema.arena, mod);
10086	break :range_val try sema.intAdd(range_minus_one, one, unsigned_operand_ty, undefined);	10086	break :range_val try sema.intAdd(range_minus_one, one, unsigned_operand_ty, undefined);
10087	} else try mod.getCoerced(dest_max_val, unsigned_operand_ty);	10087	} else try mod.getCoerced(dest_max_val, unsigned_operand_ty);
...	@@ -10734,7 +10734,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10734,7 +10734,7 @@ const SwitchProngAnalysis = struct {
10734	if (operand_ty.zigTypeTag(mod) == .Union) {	10734	if (operand_ty.zigTypeTag(mod) == .Union) {
10735	const field_index: u32 = @intCast(operand_ty.unionTagFieldIndex(item_val, mod).?);	10735	const field_index: u32 = @intCast(operand_ty.unionTagFieldIndex(item_val, mod).?);
10736	const union_obj = mod.typeToUnion(operand_ty).?;	10736	const union_obj = mod.typeToUnion(operand_ty).?;
10737	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	10737	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
10738	if (capture_byref) {	10738	if (capture_byref) {
10739	const ptr_field_ty = try sema.ptrType(.{	10739	const ptr_field_ty = try sema.ptrType(.{
10740	.child = field_ty.toIntern(),	10740	.child = field_ty.toIntern(),
...	@@ -10790,7 +10790,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10790,7 +10790,7 @@ const SwitchProngAnalysis = struct {
10790	const first_item_val = sema.resolveConstDefinedValue(block, .unneeded, case_vals[0], undefined) catch unreachable;	10790	const first_item_val = sema.resolveConstDefinedValue(block, .unneeded, case_vals[0], undefined) catch unreachable;
10791		10791
10792	const first_field_index: u32 = mod.unionTagFieldIndex(union_obj, first_item_val).?;	10792	const first_field_index: u32 = mod.unionTagFieldIndex(union_obj, first_item_val).?;
10793	const first_field_ty = union_obj.field_types.get(ip)[first_field_index].toType();	10793	const first_field_ty = Type.fromInterned(union_obj.field_types.get(ip)[first_field_index]);
10794		10794
10795	const field_indices = try sema.arena.alloc(u32, case_vals.len);	10795	const field_indices = try sema.arena.alloc(u32, case_vals.len);
10796	for (case_vals, field_indices) \|item, *field_idx\| {	10796	for (case_vals, field_indices) \|item, *field_idx\| {
...	@@ -10801,7 +10801,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10801,7 +10801,7 @@ const SwitchProngAnalysis = struct {
10801	// Fast path: if all the operands are the same type already, we don't need to hit	10801	// Fast path: if all the operands are the same type already, we don't need to hit
10802	// PTR! This will also allow us to emit simpler code.	10802	// PTR! This will also allow us to emit simpler code.
10803	const same_types = for (field_indices[1..]) \|field_idx\| {	10803	const same_types = for (field_indices[1..]) \|field_idx\| {
10804	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10804	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10805	if (!field_ty.eql(first_field_ty, sema.mod)) break false;	10805	if (!field_ty.eql(first_field_ty, sema.mod)) break false;
10806	} else true;	10806	} else true;
10807		10807
...	@@ -10809,7 +10809,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10809,7 +10809,7 @@ const SwitchProngAnalysis = struct {
10809	// We need values to run PTR on, so make a bunch of undef constants.	10809	// We need values to run PTR on, so make a bunch of undef constants.
10810	const dummy_captures = try sema.arena.alloc(Air.Inst.Ref, case_vals.len);	10810	const dummy_captures = try sema.arena.alloc(Air.Inst.Ref, case_vals.len);
10811	for (dummy_captures, field_indices) \|*dummy, field_idx\| {	10811	for (dummy_captures, field_indices) \|*dummy, field_idx\| {
10812	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10812	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10813	dummy.* = try mod.undefRef(field_ty);	10813	dummy.* = try mod.undefRef(field_ty);
10814	}	10814	}
10815		10815
...	@@ -10857,7 +10857,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10857,7 +10857,7 @@ const SwitchProngAnalysis = struct {
10857	// pointer type is in-memory coercible to the capture pointer type.	10857	// pointer type is in-memory coercible to the capture pointer type.
10858	if (!same_types) {	10858	if (!same_types) {
10859	for (field_indices, 0..) \|field_idx, i\| {	10859	for (field_indices, 0..) \|field_idx, i\| {
10860	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10860	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10861	const field_ptr_ty = try sema.ptrType(.{	10861	const field_ptr_ty = try sema.ptrType(.{
10862	.child = field_ty.toIntern(),	10862	.child = field_ty.toIntern(),
10863	.flags = .{	10863	.flags = .{
...	@@ -10906,7 +10906,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10906,7 +10906,7 @@ const SwitchProngAnalysis = struct {
10906	if (try sema.resolveDefinedValue(block, operand_src, spa.operand)) \|operand_val\| {	10906	if (try sema.resolveDefinedValue(block, operand_src, spa.operand)) \|operand_val\| {
10907	if (operand_val.isUndef(mod)) return mod.undefRef(capture_ty);	10907	if (operand_val.isUndef(mod)) return mod.undefRef(capture_ty);
10908	const union_val = ip.indexToKey(operand_val.toIntern()).un;	10908	const union_val = ip.indexToKey(operand_val.toIntern()).un;
10909	if (union_val.tag.toValue().isUndef(mod)) return mod.undefRef(capture_ty);	10909	if (Value.fromInterned(union_val.tag).isUndef(mod)) return mod.undefRef(capture_ty);
10910	const uncoerced = Air.internedToRef(union_val.val);	10910	const uncoerced = Air.internedToRef(union_val.val);
10911	return sema.coerce(block, capture_ty, uncoerced, operand_src);	10911	return sema.coerce(block, capture_ty, uncoerced, operand_src);
10912	}	10912	}
...	@@ -10921,7 +10921,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10921,7 +10921,7 @@ const SwitchProngAnalysis = struct {
10921	// If we can, try to avoid that using in-memory coercions.	10921	// If we can, try to avoid that using in-memory coercions.
10922	const first_non_imc = in_mem: {	10922	const first_non_imc = in_mem: {
10923	for (field_indices, 0..) \|field_idx, i\| {	10923	for (field_indices, 0..) \|field_idx, i\| {
10924	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10924	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10925	if (.ok != try sema.coerceInMemoryAllowed(block, capture_ty, field_ty, false, sema.mod.getTarget(), .unneeded, .unneeded)) {	10925	if (.ok != try sema.coerceInMemoryAllowed(block, capture_ty, field_ty, false, sema.mod.getTarget(), .unneeded, .unneeded)) {
10926	break :in_mem i;	10926	break :in_mem i;
10927	}	10927	}
...	@@ -10944,7 +10944,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10944,7 +10944,7 @@ const SwitchProngAnalysis = struct {
10944	{	10944	{
10945	const next = first_non_imc + 1;	10945	const next = first_non_imc + 1;
10946	for (field_indices[next..], next..) \|field_idx, i\| {	10946	for (field_indices[next..], next..) \|field_idx, i\| {
10947	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10947	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10948	if (.ok != try sema.coerceInMemoryAllowed(block, capture_ty, field_ty, false, sema.mod.getTarget(), .unneeded, .unneeded)) {	10948	if (.ok != try sema.coerceInMemoryAllowed(block, capture_ty, field_ty, false, sema.mod.getTarget(), .unneeded, .unneeded)) {
10949	in_mem_coercible.unset(i);	10949	in_mem_coercible.unset(i);
10950	}	10950	}
...	@@ -10975,7 +10975,7 @@ const SwitchProngAnalysis = struct {	...	@@ -10975,7 +10975,7 @@ const SwitchProngAnalysis = struct {
10975	defer coerce_block.instructions.deinit(sema.gpa);	10975	defer coerce_block.instructions.deinit(sema.gpa);
10976		10976
10977	const field_idx = field_indices[idx];	10977	const field_idx = field_indices[idx];
10978	const field_ty = union_obj.field_types.get(ip)[field_idx].toType();	10978	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_idx]);
10979	const uncoerced = try coerce_block.addStructFieldVal(spa.operand, field_idx, field_ty);	10979	const uncoerced = try coerce_block.addStructFieldVal(spa.operand, field_idx, field_ty);
10980	const coerced = sema.coerce(&coerce_block, capture_ty, uncoerced, .unneeded) catch \|err\| switch (err) {	10980	const coerced = sema.coerce(&coerce_block, capture_ty, uncoerced, .unneeded) catch \|err\| switch (err) {
10981	error.NeededSourceLocation => {	10981	error.NeededSourceLocation => {
...	@@ -11004,7 +11004,7 @@ const SwitchProngAnalysis = struct {	...	@@ -11004,7 +11004,7 @@ const SwitchProngAnalysis = struct {
11004		11004
11005	const first_imc_item_idx = in_mem_coercible.findFirstSet().?;	11005	const first_imc_item_idx = in_mem_coercible.findFirstSet().?;
11006	const first_imc_field_idx = field_indices[first_imc_item_idx];	11006	const first_imc_field_idx = field_indices[first_imc_item_idx];
11007	const first_imc_field_ty = union_obj.field_types.get(ip)[first_imc_field_idx].toType();	11007	const first_imc_field_ty = Type.fromInterned(union_obj.field_types.get(ip)[first_imc_field_idx]);
11008	const uncoerced = try coerce_block.addStructFieldVal(spa.operand, first_imc_field_idx, first_imc_field_ty);	11008	const uncoerced = try coerce_block.addStructFieldVal(spa.operand, first_imc_field_idx, first_imc_field_ty);
11009	const coerced = try coerce_block.addBitCast(capture_ty, uncoerced);	11009	const coerced = try coerce_block.addBitCast(capture_ty, uncoerced);
11010	_ = try coerce_block.addBr(capture_block_inst, coerced);	11010	_ = try coerce_block.addBr(capture_block_inst, coerced);
...	@@ -12510,7 +12510,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index, operand_is_r	...	@@ -12510,7 +12510,7 @@ fn zirSwitchBlock(sema: Sema, block: Block, inst: Zir.Inst.Index, operand_is_r
12510	for (seen_enum_fields, 0..) \|seen_field, index\| {	12510	for (seen_enum_fields, 0..) \|seen_field, index\| {
12511	if (seen_field != null) continue;	12511	if (seen_field != null) continue;
12512	const union_obj = mod.typeToUnion(maybe_union_ty).?;	12512	const union_obj = mod.typeToUnion(maybe_union_ty).?;
12513	const field_ty = union_obj.field_types.get(ip)[index].toType();	12513	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[index]);
12514	if (field_ty.zigTypeTag(mod) != .NoReturn) break true;	12514	if (field_ty.zigTypeTag(mod) != .NoReturn) break true;
12515	} else false	12515	} else false
12516	else	12516	else
...	@@ -12609,7 +12609,7 @@ const RangeSetUnhandledIterator = struct {	...	@@ -12609,7 +12609,7 @@ const RangeSetUnhandledIterator = struct {
12609	inline .u64, .i64 => \|val_int\| {	12609	inline .u64, .i64 => \|val_int\| {
12610	const next_int = @addWithOverflow(val_int, 1);	12610	const next_int = @addWithOverflow(val_int, 1);
12611	if (next_int[1] == 0)	12611	if (next_int[1] == 0)
12612	return (try it.mod.intValue(int.ty.toType(), next_int[0])).toIntern();	12612	return (try it.mod.intValue(Type.fromInterned(int.ty), next_int[0])).toIntern();
12613	},	12613	},
12614	.big_int => {},	12614	.big_int => {},
12615	.lazy_align, .lazy_size => unreachable,	12615	.lazy_align, .lazy_size => unreachable,
...	@@ -12625,7 +12625,7 @@ const RangeSetUnhandledIterator = struct {	...	@@ -12625,7 +12625,7 @@ const RangeSetUnhandledIterator = struct {
12625	);	12625	);
12626		12626
12627	result_bigint.addScalar(val_bigint, 1);	12627	result_bigint.addScalar(val_bigint, 1);
12628	return (try it.mod.intValue_big(int.ty.toType(), result_bigint.toConst())).toIntern();	12628	return (try it.mod.intValue_big(Type.fromInterned(int.ty), result_bigint.toConst())).toIntern();
12629	}	12629	}
12630		12630
12631	fn next(it: *RangeSetUnhandledIterator) !?InternPool.Index {	12631	fn next(it: *RangeSetUnhandledIterator) !?InternPool.Index {
...	@@ -12704,7 +12704,7 @@ fn validateSwitchRange(	...	@@ -12704,7 +12704,7 @@ fn validateSwitchRange(
12704	const mod = sema.mod;	12704	const mod = sema.mod;
12705	const first = try sema.resolveSwitchItemVal(block, first_ref, operand_ty, src_node_offset, switch_prong_src, .first);	12705	const first = try sema.resolveSwitchItemVal(block, first_ref, operand_ty, src_node_offset, switch_prong_src, .first);
12706	const last = try sema.resolveSwitchItemVal(block, last_ref, operand_ty, src_node_offset, switch_prong_src, .last);	12706	const last = try sema.resolveSwitchItemVal(block, last_ref, operand_ty, src_node_offset, switch_prong_src, .last);
12707	if (try first.val.toValue().compareAll(.gt, last.val.toValue(), operand_ty, mod)) {	12707	if (try Value.fromInterned(first.val).compareAll(.gt, Value.fromInterned(last.val), operand_ty, mod)) {
12708	const src = switch_prong_src.resolve(mod, mod.declPtr(block.src_decl), src_node_offset, .first);	12708	const src = switch_prong_src.resolve(mod, mod.declPtr(block.src_decl), src_node_offset, .first);
12709	return sema.fail(block, src, "range start value is greater than the end value", .{});	12709	return sema.fail(block, src, "range start value is greater than the end value", .{});
12710	}	12710	}
...	@@ -12815,7 +12815,7 @@ fn validateSwitchItemBool(	...	@@ -12815,7 +12815,7 @@ fn validateSwitchItemBool(
12815	) CompileError!Air.Inst.Ref {	12815	) CompileError!Air.Inst.Ref {
12816	const mod = sema.mod;	12816	const mod = sema.mod;
12817	const item = try sema.resolveSwitchItemVal(block, item_ref, Type.bool, src_node_offset, switch_prong_src, .none);	12817	const item = try sema.resolveSwitchItemVal(block, item_ref, Type.bool, src_node_offset, switch_prong_src, .none);
12818	if (item.val.toValue().toBool()) {	12818	if (Value.fromInterned(item.val).toBool()) {
12819	true_count.* += 1;	12819	true_count.* += 1;
12820	} else {	12820	} else {
12821	false_count.* += 1;	12821	false_count.* += 1;
...	@@ -13645,7 +13645,7 @@ fn analyzeTupleCat(	...	@@ -13645,7 +13645,7 @@ fn analyzeTupleCat(
13645	try sema.tupleFieldValByIndex(block, operand_src, rhs, i, rhs_ty);	13645	try sema.tupleFieldValByIndex(block, operand_src, rhs, i, rhs_ty);
13646	}	13646	}
13647		13647
13648	return block.addAggregateInit(tuple_ty.toType(), element_refs);	13648	return block.addAggregateInit(Type.fromInterned(tuple_ty), element_refs);
13649	}	13649	}
13650		13650
13651	fn zirArrayCat(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {	13651	fn zirArrayCat(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
...	@@ -13875,17 +13875,17 @@ fn getArrayCatInfo(sema: Sema, block: Block, src: LazySrcLoc, operand: Air.Ins	...	@@ -13875,17 +13875,17 @@ fn getArrayCatInfo(sema: Sema, block: Block, src: LazySrcLoc, operand: Air.Ins
13875	.needed_comptime_reason = "slice value being concatenated must be comptime-known",	13875	.needed_comptime_reason = "slice value being concatenated must be comptime-known",
13876	});	13876	});
13877	return Type.ArrayInfo{	13877	return Type.ArrayInfo{
13878	.elem_type = ptr_info.child.toType(),	13878	.elem_type = Type.fromInterned(ptr_info.child),
13879	.sentinel = switch (ptr_info.sentinel) {	13879	.sentinel = switch (ptr_info.sentinel) {
13880	.none => null,	13880	.none => null,
13881	else => ptr_info.sentinel.toValue(),	13881	else => Value.fromInterned(ptr_info.sentinel),
13882	},	13882	},
13883	.len = val.sliceLen(mod),	13883	.len = val.sliceLen(mod),
13884	};	13884	};
13885	},	13885	},
13886	.One => {	13886	.One => {
13887	if (ptr_info.child.toType().zigTypeTag(mod) == .Array) {	13887	if (Type.fromInterned(ptr_info.child).zigTypeTag(mod) == .Array) {
13888	return ptr_info.child.toType().arrayInfo(mod);	13888	return Type.fromInterned(ptr_info.child).arrayInfo(mod);
13889	}	13889	}
13890	},	13890	},
13891	.C => {},	13891	.C => {},
...	@@ -13974,7 +13974,7 @@ fn analyzeTupleMul(	...	@@ -13974,7 +13974,7 @@ fn analyzeTupleMul(
13974	@memcpy(element_refs[tuple_len * i ..][0..tuple_len], element_refs[0..tuple_len]);	13974	@memcpy(element_refs[tuple_len * i ..][0..tuple_len], element_refs[0..tuple_len]);
13975	}	13975	}
13976		13976
13977	return block.addAggregateInit(tuple_ty.toType(), element_refs);	13977	return block.addAggregateInit(Type.fromInterned(tuple_ty), element_refs);
13978	}	13978	}
13979		13979
13980	fn zirArrayMul(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {	13980	fn zirArrayMul(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref {
...	@@ -14972,10 +14972,10 @@ fn zirModRem(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.	...	@@ -14972,10 +14972,10 @@ fn zirModRem(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Air.
14972	.ComptimeInt, .Int => try mod.intValue(resolved_type.scalarType(mod), 0),	14972	.ComptimeInt, .Int => try mod.intValue(resolved_type.scalarType(mod), 0),
14973	else => unreachable,	14973	else => unreachable,
14974	};	14974	};
14975	const zero_val = if (is_vector) (try mod.intern(.{ .aggregate = .{	14975	const zero_val = if (is_vector) Value.fromInterned((try mod.intern(.{ .aggregate = .{
14976	.ty = resolved_type.toIntern(),	14976	.ty = resolved_type.toIntern(),
14977	.storage = .{ .repeated_elem = scalar_zero.toIntern() },	14977	.storage = .{ .repeated_elem = scalar_zero.toIntern() },
14978	} })).toValue() else scalar_zero;	14978	} }))) else scalar_zero;
14979	return Air.internedToRef(zero_val.toIntern());	14979	return Air.internedToRef(zero_val.toIntern());
14980	}	14980	}
14981	} else if (lhs_scalar_ty.isSignedInt(mod)) {	14981	} else if (lhs_scalar_ty.isSignedInt(mod)) {
...	@@ -15058,10 +15058,10 @@ fn intRem(	...	@@ -15058,10 +15058,10 @@ fn intRem(
15058	const rhs_elem = try rhs.elemValue(mod, i);	15058	const rhs_elem = try rhs.elemValue(mod, i);
15059	scalar.* = try (try sema.intRemScalar(lhs_elem, rhs_elem, scalar_ty)).intern(scalar_ty, mod);	15059	scalar.* = try (try sema.intRemScalar(lhs_elem, rhs_elem, scalar_ty)).intern(scalar_ty, mod);
15060	}	15060	}
15061	return (try mod.intern(.{ .aggregate = .{	15061	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
15062	.ty = ty.toIntern(),	15062	.ty = ty.toIntern(),
15063	.storage = .{ .elems = result_data },	15063	.storage = .{ .elems = result_data },
15064	} })).toValue();	15064	} })));
15065	}	15065	}
15066	return sema.intRemScalar(lhs, rhs, ty);	15066	return sema.intRemScalar(lhs, rhs, ty);
15067	}	15067	}
...	@@ -15335,7 +15335,7 @@ fn zirOverflowArithmetic(	...	@@ -15335,7 +15335,7 @@ fn zirOverflowArithmetic(
15335	const maybe_rhs_val = try sema.resolveValue(rhs);	15335	const maybe_rhs_val = try sema.resolveValue(rhs);
15336		15336
15337	const tuple_ty = try sema.overflowArithmeticTupleType(dest_ty);	15337	const tuple_ty = try sema.overflowArithmeticTupleType(dest_ty);
15338	const overflow_ty = ip.indexToKey(tuple_ty.toIntern()).anon_struct_type.types.get(ip)[1].toType();	15338	const overflow_ty = Type.fromInterned(ip.indexToKey(tuple_ty.toIntern()).anon_struct_type.types.get(ip)[1]);
15339		15339
15340	var result: struct {	15340	var result: struct {
15341	inst: Air.Inst.Ref = .none,	15341	inst: Air.Inst.Ref = .none,
...	@@ -15504,7 +15504,7 @@ fn splat(sema: *Sema, ty: Type, val: Value) !Value {	...	@@ -15504,7 +15504,7 @@ fn splat(sema: *Sema, ty: Type, val: Value) !Value {
15504	.ty = ty.toIntern(),	15504	.ty = ty.toIntern(),
15505	.storage = .{ .repeated_elem = val.toIntern() },	15505	.storage = .{ .repeated_elem = val.toIntern() },
15506	} });	15506	} });
15507	return repeated.toValue();	15507	return Value.fromInterned(repeated);
15508	}	15508	}
15509		15509
15510	fn overflowArithmeticTupleType(sema: *Sema, ty: Type) !Type {	15510	fn overflowArithmeticTupleType(sema: *Sema, ty: Type) !Type {
...	@@ -15522,7 +15522,7 @@ fn overflowArithmeticTupleType(sema: *Sema, ty: Type) !Type {	...	@@ -15522,7 +15522,7 @@ fn overflowArithmeticTupleType(sema: *Sema, ty: Type) !Type {
15522	.values = &values,	15522	.values = &values,
15523	.names = &.{},	15523	.names = &.{},
15524	});	15524	});
15525	return tuple_ty.toType();	15525	return Type.fromInterned(tuple_ty);
15526	}	15526	}
15527		15527
15528	fn analyzeArithmetic(	15528	fn analyzeArithmetic(
...	@@ -16036,7 +16036,7 @@ fn analyzePtrArithmetic(	...	@@ -16036,7 +16036,7 @@ fn analyzePtrArithmetic(
16036	}	16036	}
16037	// If the addend is not a comptime-known value we can still count on	16037	// If the addend is not a comptime-known value we can still count on
16038	// it being a multiple of the type size.	16038	// it being a multiple of the type size.
16039	const elem_size = ptr_info.child.toType().abiSize(mod);	16039	const elem_size = Type.fromInterned(ptr_info.child).abiSize(mod);
16040	const addend = if (opt_off_val) \|off_val\| a: {	16040	const addend = if (opt_off_val) \|off_val\| a: {
16041	const off_int = try sema.usizeCast(block, offset_src, off_val.toUnsignedInt(mod));	16041	const off_int = try sema.usizeCast(block, offset_src, off_val.toUnsignedInt(mod));
16042	break :a elem_size * off_int;	16042	break :a elem_size * off_int;
...	@@ -16073,7 +16073,7 @@ fn analyzePtrArithmetic(	...	@@ -16073,7 +16073,7 @@ fn analyzePtrArithmetic(
16073	const offset_int = try sema.usizeCast(block, offset_src, offset_val.toUnsignedInt(mod));	16073	const offset_int = try sema.usizeCast(block, offset_src, offset_val.toUnsignedInt(mod));
16074	if (offset_int == 0) return ptr;	16074	if (offset_int == 0) return ptr;
16075	if (try ptr_val.getUnsignedIntAdvanced(mod, sema)) \|addr\| {	16075	if (try ptr_val.getUnsignedIntAdvanced(mod, sema)) \|addr\| {
16076	const elem_size = ptr_info.child.toType().abiSize(mod);	16076	const elem_size = Type.fromInterned(ptr_info.child).abiSize(mod);
16077	const new_addr = switch (air_tag) {	16077	const new_addr = switch (air_tag) {
16078	.ptr_add => addr + elem_size * offset_int,	16078	.ptr_add => addr + elem_size * offset_int,
16079	.ptr_sub => addr - elem_size * offset_int,	16079	.ptr_sub => addr - elem_size * offset_int,
...	@@ -16748,7 +16748,7 @@ fn zirClosureGet(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!	...	@@ -16748,7 +16748,7 @@ fn zirClosureGet(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!
16748		16748
16749	assert(block.is_typeof);	16749	assert(block.is_typeof);
16750	// We need a dummy runtime instruction with the correct type.	16750	// We need a dummy runtime instruction with the correct type.
16751	return block.addTy(.alloc, capture_ty.toType());	16751	return block.addTy(.alloc, Type.fromInterned(capture_ty));
16752	}	16752	}
16753		16753
16754	fn zirRetAddr(	16754	fn zirRetAddr(
...	@@ -17042,7 +17042,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17042,7 +17042,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17042	const alignment = if (info.flags.alignment.toByteUnitsOptional()) \|alignment\|	17042	const alignment = if (info.flags.alignment.toByteUnitsOptional()) \|alignment\|
17043	try mod.intValue(Type.comptime_int, alignment)	17043	try mod.intValue(Type.comptime_int, alignment)
17044	else	17044	else
17045	try info.child.toType().lazyAbiAlignment(mod);	17045	try Type.fromInterned(info.child).lazyAbiAlignment(mod);
17046		17046
17047	const addrspace_ty = try sema.getBuiltinType("AddressSpace");	17047	const addrspace_ty = try sema.getBuiltinType("AddressSpace");
17048	const pointer_ty = t: {	17048	const pointer_ty = t: {
...	@@ -17086,7 +17086,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17086,7 +17086,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17086	// sentinel: ?*const anyopaque,	17086	// sentinel: ?*const anyopaque,
17087	(try sema.optRefValue(switch (info.sentinel) {	17087	(try sema.optRefValue(switch (info.sentinel) {
17088	.none => null,	17088	.none => null,
17089	else => info.sentinel.toValue(),	17089	else => Value.fromInterned(info.sentinel),
17090	})).toIntern(),	17090	})).toIntern(),
17091	};	17091	};
17092	return Air.internedToRef((try mod.intern(.{ .un = .{	17092	return Air.internedToRef((try mod.intern(.{ .un = .{
...	@@ -17630,10 +17630,10 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17630,10 +17630,10 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17630	} });	17630	} });
17631	};	17631	};
17632		17632
17633	try sema.resolveTypeLayout(field_ty.toType());	17633	try sema.resolveTypeLayout(Type.fromInterned(field_ty));
17634		17634
17635	const is_comptime = field_val != .none;	17635	const is_comptime = field_val != .none;
17636	const opt_default_val = if (is_comptime) field_val.toValue() else null;	17636	const opt_default_val = if (is_comptime) Value.fromInterned(field_val) else null;
17637	const default_val_ptr = try sema.optRefValue(opt_default_val);	17637	const default_val_ptr = try sema.optRefValue(opt_default_val);
17638	const struct_field_fields = .{	17638	const struct_field_fields = .{
17639	// name: []const u8,	17639	// name: []const u8,
...	@@ -17645,7 +17645,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17645,7 +17645,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17645	// is_comptime: bool,	17645	// is_comptime: bool,
17646	Value.makeBool(is_comptime).toIntern(),	17646	Value.makeBool(is_comptime).toIntern(),
17647	// alignment: comptime_int,	17647	// alignment: comptime_int,
17648	(try mod.intValue(Type.comptime_int, field_ty.toType().abiAlignment(mod).toByteUnits(0))).toIntern(),	17648	(try mod.intValue(Type.comptime_int, Type.fromInterned(field_ty).abiAlignment(mod).toByteUnits(0))).toIntern(),
17649	};	17649	};
17650	struct_field_val.* = try mod.intern(.{ .aggregate = .{	17650	struct_field_val.* = try mod.intern(.{ .aggregate = .{
17651	.ty = struct_field_ty.toIntern(),	17651	.ty = struct_field_ty.toIntern(),
...	@@ -17667,7 +17667,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17667,7 +17667,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17667	try sema.arena.dupe(u8, ip.stringToSlice(name_nts))	17667	try sema.arena.dupe(u8, ip.stringToSlice(name_nts))
17668	else	17668	else
17669	try std.fmt.allocPrintZ(sema.arena, "{d}", .{i});	17669	try std.fmt.allocPrintZ(sema.arena, "{d}", .{i});
17670	const field_ty = struct_type.field_types.get(ip)[i].toType();	17670	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
17671	const field_init = struct_type.fieldInit(ip, i);	17671	const field_init = struct_type.fieldInit(ip, i);
17672	const field_is_comptime = struct_type.fieldIsComptime(ip, i);	17672	const field_is_comptime = struct_type.fieldIsComptime(ip, i);
17673	const name_val = v: {	17673	const name_val = v: {
...	@@ -17689,7 +17689,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17689,7 +17689,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17689	} });	17689	} });
17690	};	17690	};
17691		17691
17692	const opt_default_val = if (field_init == .none) null else field_init.toValue();	17692	const opt_default_val = if (field_init == .none) null else Value.fromInterned(field_init);
17693	const default_val_ptr = try sema.optRefValue(opt_default_val);	17693	const default_val_ptr = try sema.optRefValue(opt_default_val);
17694	const alignment = switch (struct_type.layout) {	17694	const alignment = switch (struct_type.layout) {
17695	.Packed => .none,	17695	.Packed => .none,
...	@@ -17750,7 +17750,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai	...	@@ -17750,7 +17750,7 @@ fn zirTypeInfo(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!Ai
17750	const backing_integer_val = try mod.intern(.{ .opt = .{	17750	const backing_integer_val = try mod.intern(.{ .opt = .{
17751	.ty = (try mod.optionalType(.type_type)).toIntern(),	17751	.ty = (try mod.optionalType(.type_type)).toIntern(),
17752	.val = if (mod.typeToPackedStruct(ty)) \|packed_struct\| val: {	17752	.val = if (mod.typeToPackedStruct(ty)) \|packed_struct\| val: {
17753	assert(packed_struct.backingIntType(ip).toType().isInt(mod));	17753	assert(Type.fromInterned(packed_struct.backingIntType(ip).*).isInt(mod));
17754	break :val packed_struct.backingIntType(ip).*;	17754	break :val packed_struct.backingIntType(ip).*;
17755	} else .none,	17755	} else .none,
17756	} });	17756	} });
...	@@ -19145,7 +19145,7 @@ fn unionInit(	...	@@ -19145,7 +19145,7 @@ fn unionInit(
19145	const mod = sema.mod;	19145	const mod = sema.mod;
19146	const ip = &mod.intern_pool;	19146	const ip = &mod.intern_pool;
19147	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_src);	19147	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_src);
19148	const field_ty = mod.typeToUnion(union_ty).?.field_types.get(ip)[field_index].toType();	19148	const field_ty = Type.fromInterned(mod.typeToUnion(union_ty).?.field_types.get(ip)[field_index]);
19149	const init = try sema.coerce(block, field_ty, uncasted_init, init_src);	19149	const init = try sema.coerce(block, field_ty, uncasted_init, init_src);
19150		19150
19151	if (try sema.resolveValue(init)) \|init_val\| {	19151	if (try sema.resolveValue(init)) \|init_val\| {
...	@@ -19256,7 +19256,7 @@ fn zirStructInit(	...	@@ -19256,7 +19256,7 @@ fn zirStructInit(
19256	const field_index = try sema.unionFieldIndex(block, resolved_ty, field_name, field_src);	19256	const field_index = try sema.unionFieldIndex(block, resolved_ty, field_name, field_src);
19257	const tag_ty = resolved_ty.unionTagTypeHypothetical(mod);	19257	const tag_ty = resolved_ty.unionTagTypeHypothetical(mod);
19258	const tag_val = try mod.enumValueFieldIndex(tag_ty, field_index);	19258	const tag_val = try mod.enumValueFieldIndex(tag_ty, field_index);
19259	const field_ty = mod.typeToUnion(resolved_ty).?.field_types.get(ip)[field_index].toType();	19259	const field_ty = Type.fromInterned(mod.typeToUnion(resolved_ty).?.field_types.get(ip)[field_index]);
19260		19260
19261	if (field_ty.zigTypeTag(mod) == .NoReturn) {	19261	if (field_ty.zigTypeTag(mod) == .NoReturn) {
19262	return sema.failWithOwnedErrorMsg(block, msg: {	19262	return sema.failWithOwnedErrorMsg(block, msg: {
...	@@ -19275,11 +19275,11 @@ fn zirStructInit(	...	@@ -19275,11 +19275,11 @@ fn zirStructInit(
19275	const init_inst = try sema.coerce(block, field_ty, uncoerced_init_inst, field_src);	19275	const init_inst = try sema.coerce(block, field_ty, uncoerced_init_inst, field_src);
19276		19276
19277	if (try sema.resolveValue(init_inst)) \|val\| {	19277	if (try sema.resolveValue(init_inst)) \|val\| {
19278	const struct_val = (try mod.intern(.{ .un = .{	19278	const struct_val = Value.fromInterned((try mod.intern(.{ .un = .{
19279	.ty = resolved_ty.toIntern(),	19279	.ty = resolved_ty.toIntern(),
19280	.tag = try tag_val.intern(tag_ty, mod),	19280	.tag = try tag_val.intern(tag_ty, mod),
19281	.val = try val.intern(field_ty, mod),	19281	.val = try val.intern(field_ty, mod),
19282	} })).toValue();	19282	} })));
19283	const final_val_inst = try sema.coerce(block, result_ty, Air.internedToRef(struct_val.toIntern()), src);	19283	const final_val_inst = try sema.coerce(block, result_ty, Air.internedToRef(struct_val.toIntern()), src);
19284	const final_val = (try sema.resolveValue(final_val_inst)).?;	19284	const final_val = (try sema.resolveValue(final_val_inst)).?;
19285	return sema.addConstantMaybeRef(final_val.toIntern(), is_ref);	19285	return sema.addConstantMaybeRef(final_val.toIntern(), is_ref);
...	@@ -19336,7 +19336,7 @@ fn finishStructInit(	...	@@ -19336,7 +19336,7 @@ fn finishStructInit(
19336	for (0..anon_struct.types.len) \|i\| {	19336	for (0..anon_struct.types.len) \|i\| {
19337	if (field_inits[i] != .none) {	19337	if (field_inits[i] != .none) {
19338	// Coerce the init value to the field type.	19338	// Coerce the init value to the field type.
19339	const field_ty = anon_struct.types.get(ip)[i].toType();	19339	const field_ty = Type.fromInterned(anon_struct.types.get(ip)[i]);
19340	field_inits[i] = sema.coerce(block, field_ty, field_inits[i], .unneeded) catch \|err\| switch (err) {	19340	field_inits[i] = sema.coerce(block, field_ty, field_inits[i], .unneeded) catch \|err\| switch (err) {
19341	error.NeededSourceLocation => {	19341	error.NeededSourceLocation => {
19342	const decl = mod.declPtr(block.src_decl);	19342	const decl = mod.declPtr(block.src_decl);
...	@@ -19378,7 +19378,7 @@ fn finishStructInit(	...	@@ -19378,7 +19378,7 @@ fn finishStructInit(
19378	for (0..struct_type.field_types.len) \|i\| {	19378	for (0..struct_type.field_types.len) \|i\| {
19379	if (field_inits[i] != .none) {	19379	if (field_inits[i] != .none) {
19380	// Coerce the init value to the field type.	19380	// Coerce the init value to the field type.
19381	const field_ty = struct_type.field_types.get(ip)[i].toType();	19381	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
19382	field_inits[i] = sema.coerce(block, field_ty, field_inits[i], init_src) catch \|err\| switch (err) {	19382	field_inits[i] = sema.coerce(block, field_ty, field_inits[i], init_src) catch \|err\| switch (err) {
19383	error.NeededSourceLocation => {	19383	error.NeededSourceLocation => {
19384	const decl = mod.declPtr(block.src_decl);	19384	const decl = mod.declPtr(block.src_decl);
...	@@ -19548,20 +19548,20 @@ fn structInitAnon(	...	@@ -19548,20 +19548,20 @@ fn structInitAnon(
19548		19548
19549	const init = try sema.resolveInst(item.data.init);	19549	const init = try sema.resolveInst(item.data.init);
19550	field_ty.* = sema.typeOf(init).toIntern();	19550	field_ty.* = sema.typeOf(init).toIntern();
19551	if (field_ty.toType().zigTypeTag(mod) == .Opaque) {	19551	if (Type.fromInterned(field_ty.*).zigTypeTag(mod) == .Opaque) {
19552	const msg = msg: {	19552	const msg = msg: {
19553	const decl = mod.declPtr(block.src_decl);	19553	const decl = mod.declPtr(block.src_decl);
19554	const field_src = mod.initSrc(src.node_offset.x, decl, @intCast(i_usize));	19554	const field_src = mod.initSrc(src.node_offset.x, decl, @intCast(i_usize));
19555	const msg = try sema.errMsg(block, field_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});	19555	const msg = try sema.errMsg(block, field_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});
19556	errdefer msg.destroy(sema.gpa);	19556	errdefer msg.destroy(sema.gpa);
19557		19557
19558	try sema.addDeclaredHereNote(msg, field_ty.toType());	19558	try sema.addDeclaredHereNote(msg, Type.fromInterned(field_ty.*));
19559	break :msg msg;	19559	break :msg msg;
19560	};	19560	};
19561	return sema.failWithOwnedErrorMsg(block, msg);	19561	return sema.failWithOwnedErrorMsg(block, msg);
19562	}	19562	}
19563	if (try sema.resolveValue(init)) \|init_val\| {	19563	if (try sema.resolveValue(init)) \|init_val\| {
19564	field_val.* = try init_val.intern(field_ty.toType(), mod);	19564	field_val.* = try init_val.intern(Type.fromInterned(field_ty.*), mod);
19565	} else {	19565	} else {
19566	field_val.* = .none;	19566	field_val.* = .none;
19567	runtime_index = @intCast(i_usize);	19567	runtime_index = @intCast(i_usize);
...	@@ -19635,7 +19635,7 @@ fn structInitAnon(	...	@@ -19635,7 +19635,7 @@ fn structInitAnon(
19635	element_refs[i] = try sema.resolveInst(item.data.init);	19635	element_refs[i] = try sema.resolveInst(item.data.init);
19636	}	19636	}
19637		19637
19638	return block.addAggregateInit(tuple_ty.toType(), element_refs);	19638	return block.addAggregateInit(Type.fromInterned(tuple_ty), element_refs);
19639	}	19639	}
19640		19640
19641	fn zirArrayInit(	19641	fn zirArrayInit(
...	@@ -19836,12 +19836,12 @@ fn arrayInitAnon(	...	@@ -19836,12 +19836,12 @@ fn arrayInitAnon(
19836	const operand_src = src; // TODO better source location	19836	const operand_src = src; // TODO better source location
19837	const elem = try sema.resolveInst(operand);	19837	const elem = try sema.resolveInst(operand);
19838	types[i] = sema.typeOf(elem).toIntern();	19838	types[i] = sema.typeOf(elem).toIntern();
19839	if (types[i].toType().zigTypeTag(mod) == .Opaque) {	19839	if (Type.fromInterned(types[i]).zigTypeTag(mod) == .Opaque) {
19840	const msg = msg: {	19840	const msg = msg: {
19841	const msg = try sema.errMsg(block, operand_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});	19841	const msg = try sema.errMsg(block, operand_src, "opaque types have unknown size and therefore cannot be directly embedded in structs", .{});
19842	errdefer msg.destroy(gpa);	19842	errdefer msg.destroy(gpa);
19843		19843
19844	try sema.addDeclaredHereNote(msg, types[i].toType());	19844	try sema.addDeclaredHereNote(msg, Type.fromInterned(types[i]));
19845	break :msg msg;	19845	break :msg msg;
19846	};	19846	};
19847	return sema.failWithOwnedErrorMsg(block, msg);	19847	return sema.failWithOwnedErrorMsg(block, msg);
...	@@ -19899,7 +19899,7 @@ fn arrayInitAnon(	...	@@ -19899,7 +19899,7 @@ fn arrayInitAnon(
19899	element_refs[i] = try sema.resolveInst(operand);	19899	element_refs[i] = try sema.resolveInst(operand);
19900	}	19900	}
19901		19901
19902	return block.addAggregateInit(tuple_ty.toType(), element_refs);	19902	return block.addAggregateInit(Type.fromInterned(tuple_ty), element_refs);
19903	}	19903	}
19904		19904
19905	fn addConstantMaybeRef(sema: *Sema, val: InternPool.Index, is_ref: bool) !Air.Inst.Ref {	19905	fn addConstantMaybeRef(sema: *Sema, val: InternPool.Index, is_ref: bool) !Air.Inst.Ref {
...	@@ -19979,7 +19979,7 @@ fn fieldType(	...	@@ -19979,7 +19979,7 @@ fn fieldType(
19979	.Optional => {	19979	.Optional => {
19980	// Struct/array init through optional requires the child type to not be a pointer.	19980	// Struct/array init through optional requires the child type to not be a pointer.
19981	// If the child of .optional is a pointer it'll error on the next loop.	19981	// If the child of .optional is a pointer it'll error on the next loop.
19982	cur_ty = ip.indexToKey(cur_ty.toIntern()).opt_type.toType();	19982	cur_ty = Type.fromInterned(ip.indexToKey(cur_ty.toIntern()).opt_type);
19983	continue;	19983	continue;
19984	},	19984	},
19985	.ErrorUnion => {	19985	.ErrorUnion => {
...	@@ -20294,8 +20294,8 @@ fn zirReify(	...	@@ -20294,8 +20294,8 @@ fn zirReify(
20294	});	20294	});
20295	const union_val = ip.indexToKey(val.toIntern()).un;	20295	const union_val = ip.indexToKey(val.toIntern()).un;
20296	const target = mod.getTarget();	20296	const target = mod.getTarget();
20297	if (try union_val.val.toValue().anyUndef(mod)) return sema.failWithUseOfUndef(block, src);	20297	if (try Value.fromInterned(union_val.val).anyUndef(mod)) return sema.failWithUseOfUndef(block, src);
20298	const tag_index = type_info_ty.unionTagFieldIndex(union_val.tag.toValue(), mod).?;	20298	const tag_index = type_info_ty.unionTagFieldIndex(Value.fromInterned(union_val.tag), mod).?;
20299	switch (@as(std.builtin.TypeId, @enumFromInt(tag_index))) {	20299	switch (@as(std.builtin.TypeId, @enumFromInt(tag_index))) {
20300	.Type => return .type_type,	20300	.Type => return .type_type,
20301	.Void => return .void_type,	20301	.Void => return .void_type,
...	@@ -20309,11 +20309,11 @@ fn zirReify(	...	@@ -20309,11 +20309,11 @@ fn zirReify(
20309	.EnumLiteral => return .enum_literal_type,	20309	.EnumLiteral => return .enum_literal_type,
20310	.Int => {	20310	.Int => {
20311	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20311	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20312	const signedness_val = try union_val.val.toValue().fieldValue(	20312	const signedness_val = try Value.fromInterned(union_val.val).fieldValue(
20313	mod,	20313	mod,
20314	struct_type.nameIndex(ip, try ip.getOrPutString(gpa, "signedness")).?,	20314	struct_type.nameIndex(ip, try ip.getOrPutString(gpa, "signedness")).?,
20315	);	20315	);
20316	const bits_val = try union_val.val.toValue().fieldValue(	20316	const bits_val = try Value.fromInterned(union_val.val).fieldValue(
20317	mod,	20317	mod,
20318	struct_type.nameIndex(ip, try ip.getOrPutString(gpa, "bits")).?,	20318	struct_type.nameIndex(ip, try ip.getOrPutString(gpa, "bits")).?,
20319	);	20319	);
...	@@ -20325,11 +20325,11 @@ fn zirReify(	...	@@ -20325,11 +20325,11 @@ fn zirReify(
20325	},	20325	},
20326	.Vector => {	20326	.Vector => {
20327	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20327	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20328	const len_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20328	const len_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20329	ip,	20329	ip,
20330	try ip.getOrPutString(gpa, "len"),	20330	try ip.getOrPutString(gpa, "len"),
20331	).?);	20331	).?);
20332	const child_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20332	const child_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20333	ip,	20333	ip,
20334	try ip.getOrPutString(gpa, "child"),	20334	try ip.getOrPutString(gpa, "child"),
20335	).?);	20335	).?);
...	@@ -20347,7 +20347,7 @@ fn zirReify(	...	@@ -20347,7 +20347,7 @@ fn zirReify(
20347	},	20347	},
20348	.Float => {	20348	.Float => {
20349	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20349	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20350	const bits_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20350	const bits_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20351	ip,	20351	ip,
20352	try ip.getOrPutString(gpa, "bits"),	20352	try ip.getOrPutString(gpa, "bits"),
20353	).?);	20353	).?);
...	@@ -20365,35 +20365,35 @@ fn zirReify(	...	@@ -20365,35 +20365,35 @@ fn zirReify(
20365	},	20365	},
20366	.Pointer => {	20366	.Pointer => {
20367	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20367	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20368	const size_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20368	const size_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20369	ip,	20369	ip,
20370	try ip.getOrPutString(gpa, "size"),	20370	try ip.getOrPutString(gpa, "size"),
20371	).?);	20371	).?);
20372	const is_const_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20372	const is_const_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20373	ip,	20373	ip,
20374	try ip.getOrPutString(gpa, "is_const"),	20374	try ip.getOrPutString(gpa, "is_const"),
20375	).?);	20375	).?);
20376	const is_volatile_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20376	const is_volatile_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20377	ip,	20377	ip,
20378	try ip.getOrPutString(gpa, "is_volatile"),	20378	try ip.getOrPutString(gpa, "is_volatile"),
20379	).?);	20379	).?);
20380	const alignment_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20380	const alignment_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20381	ip,	20381	ip,
20382	try ip.getOrPutString(gpa, "alignment"),	20382	try ip.getOrPutString(gpa, "alignment"),
20383	).?);	20383	).?);
20384	const address_space_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20384	const address_space_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20385	ip,	20385	ip,
20386	try ip.getOrPutString(gpa, "address_space"),	20386	try ip.getOrPutString(gpa, "address_space"),
20387	).?);	20387	).?);
20388	const child_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20388	const child_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20389	ip,	20389	ip,
20390	try ip.getOrPutString(gpa, "child"),	20390	try ip.getOrPutString(gpa, "child"),
20391	).?);	20391	).?);
20392	const is_allowzero_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20392	const is_allowzero_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20393	ip,	20393	ip,
20394	try ip.getOrPutString(gpa, "is_allowzero"),	20394	try ip.getOrPutString(gpa, "is_allowzero"),
20395	).?);	20395	).?);
20396	const sentinel_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20396	const sentinel_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20397	ip,	20397	ip,
20398	try ip.getOrPutString(gpa, "sentinel"),	20398	try ip.getOrPutString(gpa, "sentinel"),
20399	).?);	20399	).?);
...	@@ -20477,15 +20477,15 @@ fn zirReify(	...	@@ -20477,15 +20477,15 @@ fn zirReify(
20477	},	20477	},
20478	.Array => {	20478	.Array => {
20479	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20479	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20480	const len_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20480	const len_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20481	ip,	20481	ip,
20482	try ip.getOrPutString(gpa, "len"),	20482	try ip.getOrPutString(gpa, "len"),
20483	).?);	20483	).?);
20484	const child_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20484	const child_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20485	ip,	20485	ip,
20486	try ip.getOrPutString(gpa, "child"),	20486	try ip.getOrPutString(gpa, "child"),
20487	).?);	20487	).?);
20488	const sentinel_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20488	const sentinel_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20489	ip,	20489	ip,
20490	try ip.getOrPutString(gpa, "sentinel"),	20490	try ip.getOrPutString(gpa, "sentinel"),
20491	).?);	20491	).?);
...	@@ -20506,7 +20506,7 @@ fn zirReify(	...	@@ -20506,7 +20506,7 @@ fn zirReify(
20506	},	20506	},
20507	.Optional => {	20507	.Optional => {
20508	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20508	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20509	const child_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20509	const child_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20510	ip,	20510	ip,
20511	try ip.getOrPutString(gpa, "child"),	20511	try ip.getOrPutString(gpa, "child"),
20512	).?);	20512	).?);
...	@@ -20518,11 +20518,11 @@ fn zirReify(	...	@@ -20518,11 +20518,11 @@ fn zirReify(
20518	},	20518	},
20519	.ErrorUnion => {	20519	.ErrorUnion => {
20520	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20520	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20521	const error_set_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20521	const error_set_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20522	ip,	20522	ip,
20523	try ip.getOrPutString(gpa, "error_set"),	20523	try ip.getOrPutString(gpa, "error_set"),
20524	).?);	20524	).?);
20525	const payload_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20525	const payload_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20526	ip,	20526	ip,
20527	try ip.getOrPutString(gpa, "payload"),	20527	try ip.getOrPutString(gpa, "payload"),
20528	).?);	20528	).?);
...	@@ -20538,7 +20538,7 @@ fn zirReify(	...	@@ -20538,7 +20538,7 @@ fn zirReify(
20538	return Air.internedToRef(ty.toIntern());	20538	return Air.internedToRef(ty.toIntern());
20539	},	20539	},
20540	.ErrorSet => {	20540	.ErrorSet => {
20541	const payload_val = union_val.val.toValue().optionalValue(mod) orelse	20541	const payload_val = Value.fromInterned(union_val.val).optionalValue(mod) orelse
20542	return Air.internedToRef(Type.anyerror.toIntern());	20542	return Air.internedToRef(Type.anyerror.toIntern());
20543		20543
20544	const len = try sema.usizeCast(block, src, payload_val.sliceLen(mod));	20544	const len = try sema.usizeCast(block, src, payload_val.sliceLen(mod));
...	@@ -20567,23 +20567,23 @@ fn zirReify(	...	@@ -20567,23 +20567,23 @@ fn zirReify(
20567	},	20567	},
20568	.Struct => {	20568	.Struct => {
20569	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20569	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20570	const layout_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20570	const layout_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20571	ip,	20571	ip,
20572	try ip.getOrPutString(gpa, "layout"),	20572	try ip.getOrPutString(gpa, "layout"),
20573	).?);	20573	).?);
20574	const backing_integer_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20574	const backing_integer_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20575	ip,	20575	ip,
20576	try ip.getOrPutString(gpa, "backing_integer"),	20576	try ip.getOrPutString(gpa, "backing_integer"),
20577	).?);	20577	).?);
20578	const fields_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20578	const fields_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20579	ip,	20579	ip,
20580	try ip.getOrPutString(gpa, "fields"),	20580	try ip.getOrPutString(gpa, "fields"),
20581	).?);	20581	).?);
20582	const decls_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20582	const decls_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20583	ip,	20583	ip,
20584	try ip.getOrPutString(gpa, "decls"),	20584	try ip.getOrPutString(gpa, "decls"),
20585	).?);	20585	).?);
20586	const is_tuple_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20586	const is_tuple_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20587	ip,	20587	ip,
20588	try ip.getOrPutString(gpa, "is_tuple"),	20588	try ip.getOrPutString(gpa, "is_tuple"),
20589	).?);	20589	).?);
...	@@ -20603,19 +20603,19 @@ fn zirReify(	...	@@ -20603,19 +20603,19 @@ fn zirReify(
20603	},	20603	},
20604	.Enum => {	20604	.Enum => {
20605	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20605	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20606	const tag_type_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20606	const tag_type_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20607	ip,	20607	ip,
20608	try ip.getOrPutString(gpa, "tag_type"),	20608	try ip.getOrPutString(gpa, "tag_type"),
20609	).?);	20609	).?);
20610	const fields_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20610	const fields_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20611	ip,	20611	ip,
20612	try ip.getOrPutString(gpa, "fields"),	20612	try ip.getOrPutString(gpa, "fields"),
20613	).?);	20613	).?);
20614	const decls_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20614	const decls_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20615	ip,	20615	ip,
20616	try ip.getOrPutString(gpa, "decls"),	20616	try ip.getOrPutString(gpa, "decls"),
20617	).?);	20617	).?);
20618	const is_exhaustive_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20618	const is_exhaustive_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20619	ip,	20619	ip,
20620	try ip.getOrPutString(gpa, "is_exhaustive"),	20620	try ip.getOrPutString(gpa, "is_exhaustive"),
20621	).?);	20621	).?);
...	@@ -20662,7 +20662,7 @@ fn zirReify(	...	@@ -20662,7 +20662,7 @@ fn zirReify(
20662	//errdefer ip.remove(incomplete_enum.index);	20662	//errdefer ip.remove(incomplete_enum.index);
20663		20663
20664	new_decl.ty = Type.type;	20664	new_decl.ty = Type.type;
20665	new_decl.val = incomplete_enum.index.toValue();	20665	new_decl.val = Value.fromInterned(incomplete_enum.index);
20666		20666
20667	for (0..fields_len) \|field_i\| {	20667	for (0..fields_len) \|field_i\| {
20668	const elem_val = try fields_val.elemValue(mod, field_i);	20668	const elem_val = try fields_val.elemValue(mod, field_i);
...	@@ -20718,7 +20718,7 @@ fn zirReify(	...	@@ -20718,7 +20718,7 @@ fn zirReify(
20718	},	20718	},
20719	.Opaque => {	20719	.Opaque => {
20720	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20720	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20721	const decls_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20721	const decls_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20722	ip,	20722	ip,
20723	try ip.getOrPutString(gpa, "decls"),	20723	try ip.getOrPutString(gpa, "decls"),
20724	).?);	20724	).?);
...	@@ -20759,8 +20759,8 @@ fn zirReify(	...	@@ -20759,8 +20759,8 @@ fn zirReify(
20759	//errdefer ip.remove(opaque_ty);	20759	//errdefer ip.remove(opaque_ty);
20760		20760
20761	new_decl.ty = Type.type;	20761	new_decl.ty = Type.type;
20762	new_decl.val = opaque_ty.toValue();	20762	new_decl.val = Value.fromInterned(opaque_ty);
20763	new_namespace.ty = opaque_ty.toType();	20763	new_namespace.ty = Type.fromInterned(opaque_ty);
20764		20764
20765	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);	20765	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);
20766	try mod.finalizeAnonDecl(new_decl_index);	20766	try mod.finalizeAnonDecl(new_decl_index);
...	@@ -20768,19 +20768,19 @@ fn zirReify(	...	@@ -20768,19 +20768,19 @@ fn zirReify(
20768	},	20768	},
20769	.Union => {	20769	.Union => {
20770	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	20770	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
20771	const layout_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20771	const layout_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20772	ip,	20772	ip,
20773	try ip.getOrPutString(gpa, "layout"),	20773	try ip.getOrPutString(gpa, "layout"),
20774	).?);	20774	).?);
20775	const tag_type_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20775	const tag_type_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20776	ip,	20776	ip,
20777	try ip.getOrPutString(gpa, "tag_type"),	20777	try ip.getOrPutString(gpa, "tag_type"),
20778	).?);	20778	).?);
20779	const fields_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20779	const fields_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20780	ip,	20780	ip,
20781	try ip.getOrPutString(gpa, "fields"),	20781	try ip.getOrPutString(gpa, "fields"),
20782	).?);	20782	).?);
20783	const decls_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	20783	const decls_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
20784	ip,	20784	ip,
20785	try ip.getOrPutString(gpa, "decls"),	20785	try ip.getOrPutString(gpa, "decls"),
20786	).?);	20786	).?);
...	@@ -20847,10 +20847,10 @@ fn zirReify(	...	@@ -20847,10 +20847,10 @@ fn zirReify(
20847	const msg = msg: {	20847	const msg = msg: {
20848	const msg = try sema.errMsg(block, src, "no field named '{}' in enum '{}'", .{	20848	const msg = try sema.errMsg(block, src, "no field named '{}' in enum '{}'", .{
20849	field_name.fmt(ip),	20849	field_name.fmt(ip),
20850	enum_tag_ty.toType().fmt(mod),	20850	Type.fromInterned(enum_tag_ty).fmt(mod),
20851	});	20851	});
20852	errdefer msg.destroy(gpa);	20852	errdefer msg.destroy(gpa);
20853	try sema.addDeclaredHereNote(msg, enum_tag_ty.toType());	20853	try sema.addDeclaredHereNote(msg, Type.fromInterned(enum_tag_ty));
20854	break :msg msg;	20854	break :msg msg;
20855	};	20855	};
20856	return sema.failWithOwnedErrorMsg(block, msg);	20856	return sema.failWithOwnedErrorMsg(block, msg);
...	@@ -20929,11 +20929,11 @@ fn zirReify(	...	@@ -20929,11 +20929,11 @@ fn zirReify(
20929		20929
20930	for (tag_info.names.get(ip), 0..) \|field_name, field_index\| {	20930	for (tag_info.names.get(ip), 0..) \|field_name, field_index\| {
20931	if (explicit_tags_seen[field_index]) continue;	20931	if (explicit_tags_seen[field_index]) continue;
20932	try sema.addFieldErrNote(enum_tag_ty.toType(), field_index, msg, "field '{}' missing, declared here", .{	20932	try sema.addFieldErrNote(Type.fromInterned(enum_tag_ty), field_index, msg, "field '{}' missing, declared here", .{
20933	field_name.fmt(ip),	20933	field_name.fmt(ip),
20934	});	20934	});
20935	}	20935	}
20936	try sema.addDeclaredHereNote(msg, enum_tag_ty.toType());	20936	try sema.addDeclaredHereNote(msg, Type.fromInterned(enum_tag_ty));
20937	break :msg msg;	20937	break :msg msg;
20938	};	20938	};
20939	return sema.failWithOwnedErrorMsg(block, msg);	20939	return sema.failWithOwnedErrorMsg(block, msg);
...	@@ -20993,8 +20993,8 @@ fn zirReify(	...	@@ -20993,8 +20993,8 @@ fn zirReify(
20993	});	20993	});
20994		20994
20995	new_decl.ty = Type.type;	20995	new_decl.ty = Type.type;
20996	new_decl.val = union_ty.toValue();	20996	new_decl.val = Value.fromInterned(union_ty);
20997	new_namespace.ty = union_ty.toType();	20997	new_namespace.ty = Type.fromInterned(union_ty);
20998		20998
20999	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);	20999	const decl_val = sema.analyzeDeclVal(block, src, new_decl_index);
21000	try mod.finalizeAnonDecl(new_decl_index);	21000	try mod.finalizeAnonDecl(new_decl_index);
...	@@ -21002,27 +21002,27 @@ fn zirReify(	...	@@ -21002,27 +21002,27 @@ fn zirReify(
21002	},	21002	},
21003	.Fn => {	21003	.Fn => {
21004	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;	21004	const struct_type = ip.indexToKey(ip.typeOf(union_val.val)).struct_type;
21005	const calling_convention_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21005	const calling_convention_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21006	ip,	21006	ip,
21007	try ip.getOrPutString(gpa, "calling_convention"),	21007	try ip.getOrPutString(gpa, "calling_convention"),
21008	).?);	21008	).?);
21009	const alignment_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21009	const alignment_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21010	ip,	21010	ip,
21011	try ip.getOrPutString(gpa, "alignment"),	21011	try ip.getOrPutString(gpa, "alignment"),
21012	).?);	21012	).?);
21013	const is_generic_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21013	const is_generic_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21014	ip,	21014	ip,
21015	try ip.getOrPutString(gpa, "is_generic"),	21015	try ip.getOrPutString(gpa, "is_generic"),
21016	).?);	21016	).?);
21017	const is_var_args_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21017	const is_var_args_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21018	ip,	21018	ip,
21019	try ip.getOrPutString(gpa, "is_var_args"),	21019	try ip.getOrPutString(gpa, "is_var_args"),
21020	).?);	21020	).?);
21021	const return_type_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21021	const return_type_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21022	ip,	21022	ip,
21023	try ip.getOrPutString(gpa, "return_type"),	21023	try ip.getOrPutString(gpa, "return_type"),
21024	).?);	21024	).?);
21025	const params_val = try union_val.val.toValue().fieldValue(mod, struct_type.nameIndex(	21025	const params_val = try Value.fromInterned(union_val.val).fieldValue(mod, struct_type.nameIndex(
21026	ip,	21026	ip,
21027	try ip.getOrPutString(gpa, "params"),	21027	try ip.getOrPutString(gpa, "params"),
21028	).?);	21028	).?);
...	@@ -21075,7 +21075,7 @@ fn zirReify(	...	@@ -21075,7 +21075,7 @@ fn zirReify(
21075	param_type.* = param_type_val.toIntern();	21075	param_type.* = param_type_val.toIntern();
21076		21076
21077	if (param_is_noalias_val.toBool()) {	21077	if (param_is_noalias_val.toBool()) {
21078	if (!param_type.toType().isPtrAtRuntime(mod)) {	21078	if (!Type.fromInterned(param_type.*).isPtrAtRuntime(mod)) {
21079	return sema.fail(block, src, "non-pointer parameter declared noalias", .{});	21079	return sema.fail(block, src, "non-pointer parameter declared noalias", .{});
21080	}	21080	}
21081	noalias_bits \|= @as(u32, 1) << (std.math.cast(u5, i) orelse	21081	noalias_bits \|= @as(u32, 1) << (std.math.cast(u5, i) orelse
...	@@ -21158,7 +21158,7 @@ fn reifyStruct(	...	@@ -21158,7 +21158,7 @@ fn reifyStruct(
21158	const struct_type = ip.indexToKey(ty).struct_type;	21158	const struct_type = ip.indexToKey(ty).struct_type;
21159		21159
21160	new_decl.ty = Type.type;	21160	new_decl.ty = Type.type;
21161	new_decl.val = ty.toValue();	21161	new_decl.val = Value.fromInterned(ty);
21162		21162
21163	// Fields	21163	// Fields
21164	for (0..fields_len) \|i\| {	21164	for (0..fields_len) \|i\| {
...	@@ -21290,11 +21290,11 @@ fn reifyStruct(	...	@@ -21290,11 +21290,11 @@ fn reifyStruct(
21290		21290
21291	if (layout == .Packed) {	21291	if (layout == .Packed) {
21292	for (0..struct_type.field_types.len) \|index\| {	21292	for (0..struct_type.field_types.len) \|index\| {
21293	const field_ty = struct_type.field_types.get(ip)[index].toType();	21293	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[index]);
21294	sema.resolveTypeLayout(field_ty) catch \|err\| switch (err) {	21294	sema.resolveTypeLayout(field_ty) catch \|err\| switch (err) {
21295	error.AnalysisFail => {	21295	error.AnalysisFail => {
21296	const msg = sema.err orelse return err;	21296	const msg = sema.err orelse return err;
21297	try sema.addFieldErrNote(ty.toType(), index, msg, "while checking this field", .{});	21297	try sema.addFieldErrNote(Type.fromInterned(ty), index, msg, "while checking this field", .{});
21298	return err;	21298	return err;
21299	},	21299	},
21300	else => return err,	21300	else => return err,
...	@@ -21303,7 +21303,7 @@ fn reifyStruct(	...	@@ -21303,7 +21303,7 @@ fn reifyStruct(
21303		21303
21304	var fields_bit_sum: u64 = 0;	21304	var fields_bit_sum: u64 = 0;
21305	for (0..struct_type.field_types.len) \|i\| {	21305	for (0..struct_type.field_types.len) \|i\| {
21306	const field_ty = struct_type.field_types.get(ip)[i].toType();	21306	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
21307	fields_bit_sum += field_ty.bitSize(mod);	21307	fields_bit_sum += field_ty.bitSize(mod);
21308	}	21308	}
21309		21309
...	@@ -21657,10 +21657,10 @@ fn ptrFromIntVal(	...	@@ -21657,10 +21657,10 @@ fn ptrFromIntVal(
21657	return sema.fail(block, operand_src, "pointer type '{}' requires aligned address", .{ptr_ty.fmt(sema.mod)});	21657	return sema.fail(block, operand_src, "pointer type '{}' requires aligned address", .{ptr_ty.fmt(sema.mod)});
21658		21658
21659	return switch (ptr_ty.zigTypeTag(mod)) {	21659	return switch (ptr_ty.zigTypeTag(mod)) {
21660	.Optional => (try mod.intern(.{ .opt = .{	21660	.Optional => Value.fromInterned((try mod.intern(.{ .opt = .{
21661	.ty = ptr_ty.toIntern(),	21661	.ty = ptr_ty.toIntern(),
21662	.val = if (addr == 0) .none else (try mod.ptrIntValue(ptr_ty.childType(mod), addr)).toIntern(),	21662	.val = if (addr == 0) .none else (try mod.ptrIntValue(ptr_ty.childType(mod), addr)).toIntern(),
21663	} })).toValue(),	21663	} }))),
21664	.Pointer => try mod.ptrIntValue(ptr_ty, addr),	21664	.Pointer => try mod.ptrIntValue(ptr_ty, addr),
21665	else => unreachable,	21665	else => unreachable,
21666	};	21666	};
...	@@ -21849,14 +21849,14 @@ fn ptrCastFull(	...	@@ -21849,14 +21849,14 @@ fn ptrCastFull(
21849	const src_info = operand_ty.ptrInfo(mod);	21849	const src_info = operand_ty.ptrInfo(mod);
21850	const dest_info = dest_ty.ptrInfo(mod);	21850	const dest_info = dest_ty.ptrInfo(mod);
21851		21851
21852	try sema.resolveTypeLayout(src_info.child.toType());	21852	try sema.resolveTypeLayout(Type.fromInterned(src_info.child));
21853	try sema.resolveTypeLayout(dest_info.child.toType());	21853	try sema.resolveTypeLayout(Type.fromInterned(dest_info.child));
21854		21854
21855	const src_slice_like = src_info.flags.size == .Slice or	21855	const src_slice_like = src_info.flags.size == .Slice or
21856	(src_info.flags.size == .One and src_info.child.toType().zigTypeTag(mod) == .Array);	21856	(src_info.flags.size == .One and Type.fromInterned(src_info.child).zigTypeTag(mod) == .Array);
21857		21857
21858	const dest_slice_like = dest_info.flags.size == .Slice or	21858	const dest_slice_like = dest_info.flags.size == .Slice or
21859	(dest_info.flags.size == .One and dest_info.child.toType().zigTypeTag(mod) == .Array);	21859	(dest_info.flags.size == .One and Type.fromInterned(dest_info.child).zigTypeTag(mod) == .Array);
21860		21860
21861	if (dest_info.flags.size == .Slice and !src_slice_like) {	21861	if (dest_info.flags.size == .Slice and !src_slice_like) {
21862	return sema.fail(block, src, "illegal pointer cast to slice", .{});	21862	return sema.fail(block, src, "illegal pointer cast to slice", .{});
...	@@ -21864,12 +21864,12 @@ fn ptrCastFull(	...	@@ -21864,12 +21864,12 @@ fn ptrCastFull(
21864		21864
21865	if (dest_info.flags.size == .Slice) {	21865	if (dest_info.flags.size == .Slice) {
21866	const src_elem_size = switch (src_info.flags.size) {	21866	const src_elem_size = switch (src_info.flags.size) {
21867	.Slice => src_info.child.toType().abiSize(mod),	21867	.Slice => Type.fromInterned(src_info.child).abiSize(mod),
21868	// pointer to array	21868	// pointer to array
21869	.One => src_info.child.toType().childType(mod).abiSize(mod),	21869	.One => Type.fromInterned(src_info.child).childType(mod).abiSize(mod),
21870	else => unreachable,	21870	else => unreachable,
21871	};	21871	};
21872	const dest_elem_size = dest_info.child.toType().abiSize(mod);	21872	const dest_elem_size = Type.fromInterned(dest_info.child).abiSize(mod);
21873	if (src_elem_size != dest_elem_size) {	21873	if (src_elem_size != dest_elem_size) {
21874	return sema.fail(block, src, "TODO: implement @ptrCast between slices changing the length", .{});	21874	return sema.fail(block, src, "TODO: implement @ptrCast between slices changing the length", .{});
21875	}	21875	}
...	@@ -21891,7 +21891,7 @@ fn ptrCastFull(	...	@@ -21891,7 +21891,7 @@ fn ptrCastFull(
21891	errdefer msg.destroy(sema.gpa);	21891	errdefer msg.destroy(sema.gpa);
21892	if (dest_info.flags.size == .Many and	21892	if (dest_info.flags.size == .Many and
21893	(src_info.flags.size == .Slice or	21893	(src_info.flags.size == .Slice or
21894	(src_info.flags.size == .One and src_info.child.toType().zigTypeTag(mod) == .Array)))	21894	(src_info.flags.size == .One and Type.fromInterned(src_info.child).zigTypeTag(mod) == .Array)))
21895	{	21895	{
21896	try sema.errNote(block, src, msg, "use 'ptr' field to convert slice to many pointer", .{});	21896	try sema.errNote(block, src, msg, "use 'ptr' field to convert slice to many pointer", .{});
21897	} else {	21897	} else {
...	@@ -21904,10 +21904,10 @@ fn ptrCastFull(	...	@@ -21904,10 +21904,10 @@ fn ptrCastFull(
21904	check_child: {	21904	check_child: {
21905	const src_child = if (dest_info.flags.size == .Slice and src_info.flags.size == .One) blk: {	21905	const src_child = if (dest_info.flags.size == .Slice and src_info.flags.size == .One) blk: {
21906	// *[n]T -> []T	21906	// *[n]T -> []T
21907	break :blk src_info.child.toType().childType(mod);	21907	break :blk Type.fromInterned(src_info.child).childType(mod);
21908	} else src_info.child.toType();	21908	} else Type.fromInterned(src_info.child);
21909		21909
21910	const dest_child = dest_info.child.toType();	21910	const dest_child = Type.fromInterned(dest_info.child);
21911		21911
21912	const imc_res = try sema.coerceInMemoryAllowed(	21912	const imc_res = try sema.coerceInMemoryAllowed(
21913	block,	21913	block,
...	@@ -21940,7 +21940,7 @@ fn ptrCastFull(	...	@@ -21940,7 +21940,7 @@ fn ptrCastFull(
21940	}	21940	}
21941	if (src_slice_like and src_info.flags.size == .One and dest_info.flags.size == .Slice) {	21941	if (src_slice_like and src_info.flags.size == .One and dest_info.flags.size == .Slice) {
21942	// [*]nT -> []T	21942	// [*]nT -> []T
21943	const arr_ty = src_info.child.toType();	21943	const arr_ty = Type.fromInterned(src_info.child);
21944	if (arr_ty.sentinel(mod)) \|src_sentinel\| {	21944	if (arr_ty.sentinel(mod)) \|src_sentinel\| {
21945	const coerced_sent = try mod.intern_pool.getCoerced(sema.gpa, src_sentinel.toIntern(), dest_info.child);	21945	const coerced_sent = try mod.intern_pool.getCoerced(sema.gpa, src_sentinel.toIntern(), dest_info.child);
21946	if (dest_info.sentinel == coerced_sent) break :check_sent;	21946	if (dest_info.sentinel == coerced_sent) break :check_sent;
...	@@ -21949,12 +21949,12 @@ fn ptrCastFull(	...	@@ -21949,12 +21949,12 @@ fn ptrCastFull(
21949	return sema.failWithOwnedErrorMsg(block, msg: {	21949	return sema.failWithOwnedErrorMsg(block, msg: {
21950	const msg = if (src_info.sentinel == .none) blk: {	21950	const msg = if (src_info.sentinel == .none) blk: {
21951	break :blk try sema.errMsg(block, src, "destination pointer requires '{}' sentinel", .{	21951	break :blk try sema.errMsg(block, src, "destination pointer requires '{}' sentinel", .{
21952	dest_info.sentinel.toValue().fmtValue(dest_info.child.toType(), mod),	21952	Value.fromInterned(dest_info.sentinel).fmtValue(Type.fromInterned(dest_info.child), mod),
21953	});	21953	});
21954	} else blk: {	21954	} else blk: {
21955	break :blk try sema.errMsg(block, src, "pointer sentinel '{}' cannot coerce into pointer sentinel '{}'", .{	21955	break :blk try sema.errMsg(block, src, "pointer sentinel '{}' cannot coerce into pointer sentinel '{}'", .{
21956	src_info.sentinel.toValue().fmtValue(src_info.child.toType(), mod),	21956	Value.fromInterned(src_info.sentinel).fmtValue(Type.fromInterned(src_info.child), mod),
21957	dest_info.sentinel.toValue().fmtValue(dest_info.child.toType(), mod),	21957	Value.fromInterned(dest_info.sentinel).fmtValue(Type.fromInterned(dest_info.child), mod),
21958	});	21958	});
21959	};	21959	};
21960	errdefer msg.destroy(sema.gpa);	21960	errdefer msg.destroy(sema.gpa);
...	@@ -22010,12 +22010,12 @@ fn ptrCastFull(	...	@@ -22010,12 +22010,12 @@ fn ptrCastFull(
22010	const src_align = if (src_info.flags.alignment != .none)	22010	const src_align = if (src_info.flags.alignment != .none)
22011	src_info.flags.alignment	22011	src_info.flags.alignment
22012	else	22012	else
22013	src_info.child.toType().abiAlignment(mod);	22013	Type.fromInterned(src_info.child).abiAlignment(mod);
22014		22014
22015	const dest_align = if (dest_info.flags.alignment != .none)	22015	const dest_align = if (dest_info.flags.alignment != .none)
22016	dest_info.flags.alignment	22016	dest_info.flags.alignment
22017	else	22017	else
22018	dest_info.child.toType().abiAlignment(mod);	22018	Type.fromInterned(dest_info.child).abiAlignment(mod);
22019		22019
22020	if (!flags.align_cast) {	22020	if (!flags.align_cast) {
22021	if (dest_align.compare(.gt, src_align)) {	22021	if (dest_align.compare(.gt, src_align)) {
...	@@ -22123,7 +22123,7 @@ fn ptrCastFull(	...	@@ -22123,7 +22123,7 @@ fn ptrCastFull(
22123	}	22123	}
22124	if (dest_info.flags.size == .Slice and src_info.flags.size != .Slice) {	22124	if (dest_info.flags.size == .Slice and src_info.flags.size != .Slice) {
22125	if (ptr_val.isUndef(mod)) return mod.undefRef(dest_ty);	22125	if (ptr_val.isUndef(mod)) return mod.undefRef(dest_ty);
22126	const arr_len = try mod.intValue(Type.usize, src_info.child.toType().arrayLen(mod));	22126	const arr_len = try mod.intValue(Type.usize, Type.fromInterned(src_info.child).arrayLen(mod));
22127	return Air.internedToRef((try mod.intern(.{ .ptr = .{	22127	return Air.internedToRef((try mod.intern(.{ .ptr = .{
22128	.ty = dest_ty.toIntern(),	22128	.ty = dest_ty.toIntern(),
22129	.addr = mod.intern_pool.indexToKey(ptr_val.toIntern()).ptr.addr,	22129	.addr = mod.intern_pool.indexToKey(ptr_val.toIntern()).ptr.addr,
...	@@ -22139,7 +22139,7 @@ fn ptrCastFull(	...	@@ -22139,7 +22139,7 @@ fn ptrCastFull(
22139	try sema.requireRuntimeBlock(block, src, null);	22139	try sema.requireRuntimeBlock(block, src, null);
22140		22140
22141	if (block.wantSafety() and operand_ty.ptrAllowsZero(mod) and !dest_ty.ptrAllowsZero(mod) and	22141	if (block.wantSafety() and operand_ty.ptrAllowsZero(mod) and !dest_ty.ptrAllowsZero(mod) and
22142	(try sema.typeHasRuntimeBits(dest_info.child.toType()) or dest_info.child.toType().zigTypeTag(mod) == .Fn))	22142	(try sema.typeHasRuntimeBits(Type.fromInterned(dest_info.child)) or Type.fromInterned(dest_info.child).zigTypeTag(mod) == .Fn))
22143	{	22143	{
22144	const ptr_int = try block.addUnOp(.int_from_ptr, ptr);	22144	const ptr_int = try block.addUnOp(.int_from_ptr, ptr);
22145	const is_non_zero = try block.addBinOp(.cmp_neq, ptr_int, .zero_usize);	22145	const is_non_zero = try block.addBinOp(.cmp_neq, ptr_int, .zero_usize);
...	@@ -22153,7 +22153,7 @@ fn ptrCastFull(	...	@@ -22153,7 +22153,7 @@ fn ptrCastFull(
22153		22153
22154	if (block.wantSafety() and	22154	if (block.wantSafety() and
22155	dest_align.compare(.gt, src_align) and	22155	dest_align.compare(.gt, src_align) and
22156	try sema.typeHasRuntimeBits(dest_info.child.toType()))	22156	try sema.typeHasRuntimeBits(Type.fromInterned(dest_info.child)))
22157	{	22157	{
22158	const align_bytes_minus_1 = dest_align.toByteUnitsOptional().? - 1;	22158	const align_bytes_minus_1 = dest_align.toByteUnitsOptional().? - 1;
22159	const align_minus_1 = Air.internedToRef((try mod.intValue(Type.usize, align_bytes_minus_1)).toIntern());	22159	const align_minus_1 = Air.internedToRef((try mod.intValue(Type.usize, align_bytes_minus_1)).toIntern());
...	@@ -22196,7 +22196,7 @@ fn ptrCastFull(	...	@@ -22196,7 +22196,7 @@ fn ptrCastFull(
22196	if (dest_info.flags.size == .Slice and src_info.flags.size != .Slice) {	22196	if (dest_info.flags.size == .Slice and src_info.flags.size != .Slice) {
22197	// We have to construct a slice using the operand's child's array length	22197	// We have to construct a slice using the operand's child's array length
22198	// Note that we know from the check at the start of the function that operand_ty is slice-like	22198	// Note that we know from the check at the start of the function that operand_ty is slice-like
22199	const arr_len = Air.internedToRef((try mod.intValue(Type.usize, src_info.child.toType().arrayLen(mod))).toIntern());	22199	const arr_len = Air.internedToRef((try mod.intValue(Type.usize, Type.fromInterned(src_info.child).arrayLen(mod))).toIntern());
22200	return block.addInst(.{	22200	return block.addInst(.{
22201	.tag = .slice,	22201	.tag = .slice,
22202	.data = .{ .ty_pl = .{	22202	.data = .{ .ty_pl = .{
...	@@ -22549,7 +22549,7 @@ fn bitOffsetOf(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!u6	...	@@ -22549,7 +22549,7 @@ fn bitOffsetOf(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!u6
22549	if (i == field_index) {	22549	if (i == field_index) {
22550	return bit_sum;	22550	return bit_sum;
22551	}	22551	}
22552	const field_ty = struct_type.field_types.get(ip)[i].toType();	22552	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
22553	bit_sum += field_ty.bitSize(mod);	22553	bit_sum += field_ty.bitSize(mod);
22554	} else unreachable;	22554	} else unreachable;
22555	},	22555	},
...	@@ -23447,10 +23447,10 @@ fn analyzeShuffle(	...	@@ -23447,10 +23447,10 @@ fn analyzeShuffle(
23447		23447
23448	if (a_len < b_len) {	23448	if (a_len < b_len) {
23449	const undef = try mod.undefRef(a_ty);	23449	const undef = try mod.undefRef(a_ty);
23450	a = try sema.analyzeShuffle(block, src_node, elem_ty, a, undef, expand_mask.toValue(), @intCast(max_len));	23450	a = try sema.analyzeShuffle(block, src_node, elem_ty, a, undef, Value.fromInterned(expand_mask), @intCast(max_len));
23451	} else {	23451	} else {
23452	const undef = try mod.undefRef(b_ty);	23452	const undef = try mod.undefRef(b_ty);
23453	b = try sema.analyzeShuffle(block, src_node, elem_ty, b, undef, expand_mask.toValue(), @intCast(max_len));	23453	b = try sema.analyzeShuffle(block, src_node, elem_ty, b, undef, Value.fromInterned(expand_mask), @intCast(max_len));
23454	}	23454	}
23455	}	23455	}
23456		23456
...	@@ -24546,10 +24546,10 @@ fn zirMemset(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void	...	@@ -24546,10 +24546,10 @@ fn zirMemset(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void
24546	const dest_elem_ty: Type = dest_elem_ty: {	24546	const dest_elem_ty: Type = dest_elem_ty: {
24547	const ptr_info = dest_ptr_ty.ptrInfo(mod);	24547	const ptr_info = dest_ptr_ty.ptrInfo(mod);
24548	switch (ptr_info.flags.size) {	24548	switch (ptr_info.flags.size) {
24549	.Slice => break :dest_elem_ty ptr_info.child.toType(),	24549	.Slice => break :dest_elem_ty Type.fromInterned(ptr_info.child),
24550	.One => {	24550	.One => {
24551	if (ptr_info.child.toType().zigTypeTag(mod) == .Array) {	24551	if (Type.fromInterned(ptr_info.child).zigTypeTag(mod) == .Array) {
24552	break :dest_elem_ty ptr_info.child.toType().childType(mod);	24552	break :dest_elem_ty Type.fromInterned(ptr_info.child).childType(mod);
24553	}	24553	}
24554	},	24554	},
24555	.Many, .C => {},	24555	.Many, .C => {},
...	@@ -24583,10 +24583,10 @@ fn zirMemset(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void	...	@@ -24583,10 +24583,10 @@ fn zirMemset(sema: Sema, block: Block, inst: Zir.Inst.Index) CompileError!void
24583	.child = dest_elem_ty.toIntern(),	24583	.child = dest_elem_ty.toIntern(),
24584	.len = len_u64,	24584	.len = len_u64,
24585	});	24585	});
24586	const array_val = (try mod.intern(.{ .aggregate = .{	24586	const array_val = Value.fromInterned((try mod.intern(.{ .aggregate = .{
24587	.ty = array_ty.toIntern(),	24587	.ty = array_ty.toIntern(),
24588	.storage = .{ .repeated_elem = elem_val.toIntern() },	24588	.storage = .{ .repeated_elem = elem_val.toIntern() },
24589	} })).toValue();	24589	} })));
24590	const array_ptr_ty = ty: {	24590	const array_ptr_ty = ty: {
24591	var info = dest_ptr_ty.ptrInfo(mod);	24591	var info = dest_ptr_ty.ptrInfo(mod);
24592	info.flags.size = .One;	24592	info.flags.size = .One;
...	@@ -25227,7 +25227,7 @@ fn zirBuiltinExtern(	...	@@ -25227,7 +25227,7 @@ fn zirBuiltinExtern(
25227	// We only access this decl through the decl_ref with the correct type created	25227	// We only access this decl through the decl_ref with the correct type created
25228	// below, so this type doesn't matter	25228	// below, so this type doesn't matter
25229	new_decl.ty = ty;	25229	new_decl.ty = ty;
25230	new_decl.val = new_var.toValue();	25230	new_decl.val = Value.fromInterned(new_var);
25231	new_decl.alignment = .none;	25231	new_decl.alignment = .none;
25232	new_decl.@"linksection" = .none;	25232	new_decl.@"linksection" = .none;
25233	new_decl.has_tv = true;	25233	new_decl.has_tv = true;
...	@@ -25237,14 +25237,14 @@ fn zirBuiltinExtern(	...	@@ -25237,14 +25237,14 @@ fn zirBuiltinExtern(
25237		25237
25238	try sema.ensureDeclAnalyzed(new_decl_index);	25238	try sema.ensureDeclAnalyzed(new_decl_index);
25239		25239
25240	return Air.internedToRef((try mod.getCoerced((try mod.intern(.{ .ptr = .{	25240	return Air.internedToRef((try mod.getCoerced(Value.fromInterned((try mod.intern(.{ .ptr = .{
25241	.ty = switch (mod.intern_pool.indexToKey(ty.toIntern())) {	25241	.ty = switch (mod.intern_pool.indexToKey(ty.toIntern())) {
25242	.ptr_type => ty.toIntern(),	25242	.ptr_type => ty.toIntern(),
25243	.opt_type => \|child_type\| child_type,	25243	.opt_type => \|child_type\| child_type,
25244	else => unreachable,	25244	else => unreachable,
25245	},	25245	},
25246	.addr = .{ .decl = new_decl_index },	25246	.addr = .{ .decl = new_decl_index },
25247	} })).toValue(), ty)).toIntern());	25247	} }))), ty)).toIntern());
25248	}	25248	}
25249		25249
25250	fn zirWorkItem(	25250	fn zirWorkItem(
...	@@ -25430,7 +25430,7 @@ fn explainWhyTypeIsComptimeInner(	...	@@ -25430,7 +25430,7 @@ fn explainWhyTypeIsComptimeInner(
25430	.Inline => try mod.errNoteNonLazy(src_loc, msg, "function has inline calling convention", .{}),	25430	.Inline => try mod.errNoteNonLazy(src_loc, msg, "function has inline calling convention", .{}),
25431	else => {},	25431	else => {},
25432	}	25432	}
25433	if (fn_info.return_type.toType().comptimeOnly(mod)) {	25433	if (Type.fromInterned(fn_info.return_type).comptimeOnly(mod)) {
25434	try mod.errNoteNonLazy(src_loc, msg, "function has a comptime-only return type", .{});	25434	try mod.errNoteNonLazy(src_loc, msg, "function has a comptime-only return type", .{});
25435	}	25435	}
25436	return;	25436	return;
...	@@ -25450,7 +25450,7 @@ fn explainWhyTypeIsComptimeInner(	...	@@ -25450,7 +25450,7 @@ fn explainWhyTypeIsComptimeInner(
25450		25450
25451	if (mod.typeToStruct(ty)) \|struct_type\| {	25451	if (mod.typeToStruct(ty)) \|struct_type\| {
25452	for (0..struct_type.field_types.len) \|i\| {	25452	for (0..struct_type.field_types.len) \|i\| {
25453	const field_ty = struct_type.field_types.get(ip)[i].toType();	25453	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
25454	const field_src_loc = mod.fieldSrcLoc(struct_type.decl.unwrap().?, .{	25454	const field_src_loc = mod.fieldSrcLoc(struct_type.decl.unwrap().?, .{
25455	.index = i,	25455	.index = i,
25456	.range = .type,	25456	.range = .type,
...	@@ -25470,7 +25470,7 @@ fn explainWhyTypeIsComptimeInner(	...	@@ -25470,7 +25470,7 @@ fn explainWhyTypeIsComptimeInner(
25470		25470
25471	if (mod.typeToUnion(ty)) \|union_obj\| {	25471	if (mod.typeToUnion(ty)) \|union_obj\| {
25472	for (0..union_obj.field_types.len) \|i\| {	25472	for (0..union_obj.field_types.len) \|i\| {
25473	const field_ty = union_obj.field_types.get(ip)[i].toType();	25473	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[i]);
25474	const field_src_loc = mod.fieldSrcLoc(union_obj.decl, .{	25474	const field_src_loc = mod.fieldSrcLoc(union_obj.decl, .{
25475	.index = i,	25475	.index = i,
25476	.range = .type,	25476	.range = .type,
...	@@ -26096,7 +26096,7 @@ fn fieldVal(	...	@@ -26096,7 +26096,7 @@ fn fieldVal(
26096	} else if (ip.stringEqlSlice(field_name, "ptr") and is_pointer_to) {	26096	} else if (ip.stringEqlSlice(field_name, "ptr") and is_pointer_to) {
26097	const ptr_info = object_ty.ptrInfo(mod);	26097	const ptr_info = object_ty.ptrInfo(mod);
26098	const result_ty = try sema.ptrType(.{	26098	const result_ty = try sema.ptrType(.{
26099	.child = ptr_info.child.toType().childType(mod).toIntern(),	26099	.child = Type.fromInterned(ptr_info.child).childType(mod).toIntern(),
26100	.sentinel = if (inner_ty.sentinel(mod)) \|s\| s.toIntern() else .none,	26100	.sentinel = if (inner_ty.sentinel(mod)) \|s\| s.toIntern() else .none,
26101	.flags = .{	26101	.flags = .{
26102	.size = .Many,	26102	.size = .Many,
...	@@ -26515,7 +26515,7 @@ fn fieldCallBind(	...	@@ -26515,7 +26515,7 @@ fn fieldCallBind(
26515	if (mod.typeToStruct(concrete_ty)) \|struct_type\| {	26515	if (mod.typeToStruct(concrete_ty)) \|struct_type\| {
26516	const field_index = struct_type.nameIndex(ip, field_name) orelse	26516	const field_index = struct_type.nameIndex(ip, field_name) orelse
26517	break :find_field;	26517	break :find_field;
26518	const field_ty = struct_type.field_types.get(ip)[field_index].toType();	26518	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
26519		26519
26520	return sema.finishFieldCallBind(block, src, ptr_ty, field_ty, field_index, object_ptr);	26520	return sema.finishFieldCallBind(block, src, ptr_ty, field_ty, field_index, object_ptr);
26521	} else if (concrete_ty.isTuple(mod)) {	26521	} else if (concrete_ty.isTuple(mod)) {
...	@@ -26540,7 +26540,7 @@ fn fieldCallBind(	...	@@ -26540,7 +26540,7 @@ fn fieldCallBind(
26540	try sema.resolveTypeFields(concrete_ty);	26540	try sema.resolveTypeFields(concrete_ty);
26541	const union_obj = mod.typeToUnion(concrete_ty).?;	26541	const union_obj = mod.typeToUnion(concrete_ty).?;
26542	const field_index = union_obj.nameIndex(ip, field_name) orelse break :find_field;	26542	const field_index = union_obj.nameIndex(ip, field_name) orelse break :find_field;
26543	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	26543	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
26544		26544
26545	return sema.finishFieldCallBind(block, src, ptr_ty, field_ty, field_index, object_ptr);	26545	return sema.finishFieldCallBind(block, src, ptr_ty, field_ty, field_index, object_ptr);
26546	},	26546	},
...	@@ -26563,7 +26563,7 @@ fn fieldCallBind(	...	@@ -26563,7 +26563,7 @@ fn fieldCallBind(
26563	if (mod.typeToFunc(decl_type)) \|func_type\| f: {	26563	if (mod.typeToFunc(decl_type)) \|func_type\| f: {
26564	if (func_type.param_types.len == 0) break :f;	26564	if (func_type.param_types.len == 0) break :f;
26565		26565
26566	const first_param_type = func_type.param_types.get(ip)[0].toType();	26566	const first_param_type = Type.fromInterned(func_type.param_types.get(ip)[0]);
26567	// zig fmt: off	26567	// zig fmt: off
26568	if (first_param_type.isGenericPoison() or (	26568	if (first_param_type.isGenericPoison() or (
26569	first_param_type.zigTypeTag(mod) == .Pointer and	26569	first_param_type.zigTypeTag(mod) == .Pointer and
...	@@ -26803,14 +26803,14 @@ fn structFieldPtrByIndex(	...	@@ -26803,14 +26803,14 @@ fn structFieldPtrByIndex(
26803	const parent_align = if (struct_ptr_ty_info.flags.alignment != .none)	26803	const parent_align = if (struct_ptr_ty_info.flags.alignment != .none)
26804	struct_ptr_ty_info.flags.alignment	26804	struct_ptr_ty_info.flags.alignment
26805	else	26805	else
26806	try sema.typeAbiAlignment(struct_ptr_ty_info.child.toType());	26806	try sema.typeAbiAlignment(Type.fromInterned(struct_ptr_ty_info.child));
26807		26807
26808	if (struct_type.layout == .Packed) {	26808	if (struct_type.layout == .Packed) {
26809	comptime assert(Type.packed_struct_layout_version == 2);	26809	comptime assert(Type.packed_struct_layout_version == 2);
26810		26810
26811	var running_bits: u16 = 0;	26811	var running_bits: u16 = 0;
26812	for (0..struct_type.field_types.len) \|i\| {	26812	for (0..struct_type.field_types.len) \|i\| {
26813	const f_ty = struct_type.field_types.get(ip)[i].toType();	26813	const f_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
26814	if (!(try sema.typeHasRuntimeBits(f_ty))) continue;	26814	if (!(try sema.typeHasRuntimeBits(f_ty))) continue;
26815		26815
26816	if (i == field_index) {	26816	if (i == field_index) {
...	@@ -26840,8 +26840,8 @@ fn structFieldPtrByIndex(	...	@@ -26840,8 +26840,8 @@ fn structFieldPtrByIndex(
26840	if (parent_align != .none and ptr_ty_data.packed_offset.bit_offset % 8 == 0 and	26840	if (parent_align != .none and ptr_ty_data.packed_offset.bit_offset % 8 == 0 and
26841	target.cpu.arch.endian() == .little)	26841	target.cpu.arch.endian() == .little)
26842	{	26842	{
26843	const elem_size_bytes = try sema.typeAbiSize(ptr_ty_data.child.toType());	26843	const elem_size_bytes = try sema.typeAbiSize(Type.fromInterned(ptr_ty_data.child));
26844	const elem_size_bits = ptr_ty_data.child.toType().bitSize(mod);	26844	const elem_size_bits = Type.fromInterned(ptr_ty_data.child).bitSize(mod);
26845	if (elem_size_bytes * 8 == elem_size_bits) {	26845	if (elem_size_bytes * 8 == elem_size_bits) {
26846	const byte_offset = ptr_ty_data.packed_offset.bit_offset / 8;	26846	const byte_offset = ptr_ty_data.packed_offset.bit_offset / 8;
26847	const new_align: Alignment = @enumFromInt(@ctz(byte_offset \| parent_align.toByteUnitsOptional().?));	26847	const new_align: Alignment = @enumFromInt(@ctz(byte_offset \| parent_align.toByteUnitsOptional().?));
...	@@ -26863,7 +26863,7 @@ fn structFieldPtrByIndex(	...	@@ -26863,7 +26863,7 @@ fn structFieldPtrByIndex(
26863	// Our alignment is capped at the field alignment.	26863	// Our alignment is capped at the field alignment.
26864	const field_align = try sema.structFieldAlignment(	26864	const field_align = try sema.structFieldAlignment(
26865	struct_type.fieldAlign(ip, field_index),	26865	struct_type.fieldAlign(ip, field_index),
26866	field_ty.toType(),	26866	Type.fromInterned(field_ty),
26867	struct_type.layout,	26867	struct_type.layout,
26868	);	26868	);
26869	ptr_ty_data.flags.alignment = if (struct_ptr_ty_info.flags.alignment == .none)	26869	ptr_ty_data.flags.alignment = if (struct_ptr_ty_info.flags.alignment == .none)
...	@@ -26925,7 +26925,7 @@ fn structFieldVal(	...	@@ -26925,7 +26925,7 @@ fn structFieldVal(
26925	return Air.internedToRef(struct_type.field_inits.get(ip)[field_index]);	26925	return Air.internedToRef(struct_type.field_inits.get(ip)[field_index]);
26926	}	26926	}
26927		26927
26928	const field_ty = struct_type.field_types.get(ip)[field_index].toType();	26928	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
26929		26929
26930	if (try sema.resolveValue(struct_byval)) \|struct_val\| {	26930	if (try sema.resolveValue(struct_byval)) \|struct_val\| {
26931	if (struct_val.isUndef(mod)) return mod.undefRef(field_ty);	26931	if (struct_val.isUndef(mod)) return mod.undefRef(field_ty);
...	@@ -27013,8 +27013,8 @@ fn tupleFieldValByIndex(	...	@@ -27013,8 +27013,8 @@ fn tupleFieldValByIndex(
27013	.undef => mod.undefRef(field_ty),	27013	.undef => mod.undefRef(field_ty),
27014	.aggregate => \|aggregate\| Air.internedToRef(switch (aggregate.storage) {	27014	.aggregate => \|aggregate\| Air.internedToRef(switch (aggregate.storage) {
27015	.bytes => \|bytes\| try mod.intValue(Type.u8, bytes[0]),	27015	.bytes => \|bytes\| try mod.intValue(Type.u8, bytes[0]),
27016	.elems => \|elems\| elems[field_index].toValue(),	27016	.elems => \|elems\| Value.fromInterned(elems[field_index]),
27017	.repeated_elem => \|elem\| elem.toValue(),	27017	.repeated_elem => \|elem\| Value.fromInterned(elem),
27018	}.toIntern()),	27018	}.toIntern()),
27019	else => unreachable,	27019	else => unreachable,
27020	};	27020	};
...	@@ -27049,7 +27049,7 @@ fn unionFieldPtr(	...	@@ -27049,7 +27049,7 @@ fn unionFieldPtr(
27049	try sema.resolveTypeFields(union_ty);	27049	try sema.resolveTypeFields(union_ty);
27050	const union_obj = mod.typeToUnion(union_ty).?;	27050	const union_obj = mod.typeToUnion(union_ty).?;
27051	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);	27051	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);
27052	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	27052	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
27053	const ptr_field_ty = try sema.ptrType(.{	27053	const ptr_field_ty = try sema.ptrType(.{
27054	.child = field_ty.toIntern(),	27054	.child = field_ty.toIntern(),
27055	.flags = .{	27055	.flags = .{
...	@@ -27067,7 +27067,7 @@ fn unionFieldPtr(	...	@@ -27067,7 +27067,7 @@ fn unionFieldPtr(
27067	},	27067	},
27068	.packed_offset = union_ptr_info.packed_offset,	27068	.packed_offset = union_ptr_info.packed_offset,
27069	});	27069	});
27070	const enum_field_index: u32 = @intCast(union_obj.enum_tag_ty.toType().enumFieldIndex(field_name, mod).?);	27070	const enum_field_index: u32 = @intCast(Type.fromInterned(union_obj.enum_tag_ty).enumFieldIndex(field_name, mod).?);
27071		27071
27072	if (initializing and field_ty.zigTypeTag(mod) == .NoReturn) {	27072	if (initializing and field_ty.zigTypeTag(mod) == .NoReturn) {
27073	const msg = msg: {	27073	const msg = msg: {
...	@@ -27092,12 +27092,12 @@ fn unionFieldPtr(	...	@@ -27092,12 +27092,12 @@ fn unionFieldPtr(
27092	return sema.failWithUseOfUndef(block, src);	27092	return sema.failWithUseOfUndef(block, src);
27093	}	27093	}
27094	const un = ip.indexToKey(union_val.toIntern()).un;	27094	const un = ip.indexToKey(union_val.toIntern()).un;
27095	const field_tag = try mod.enumValueFieldIndex(union_obj.enum_tag_ty.toType(), enum_field_index);	27095	const field_tag = try mod.enumValueFieldIndex(Type.fromInterned(union_obj.enum_tag_ty), enum_field_index);
27096	const tag_matches = un.tag == field_tag.toIntern();	27096	const tag_matches = un.tag == field_tag.toIntern();
27097	if (!tag_matches) {	27097	if (!tag_matches) {
27098	const msg = msg: {	27098	const msg = msg: {
27099	const active_index = union_obj.enum_tag_ty.toType().enumTagFieldIndex(un.tag.toValue(), mod).?;	27099	const active_index = Type.fromInterned(union_obj.enum_tag_ty).enumTagFieldIndex(Value.fromInterned(un.tag), mod).?;
27100	const active_field_name = union_obj.enum_tag_ty.toType().enumFieldName(active_index, mod);	27100	const active_field_name = Type.fromInterned(union_obj.enum_tag_ty).enumFieldName(active_index, mod);
27101	const msg = try sema.errMsg(block, src, "access of union field '{}' while field '{}' is active", .{	27101	const msg = try sema.errMsg(block, src, "access of union field '{}' while field '{}' is active", .{
27102	field_name.fmt(ip),	27102	field_name.fmt(ip),
27103	active_field_name.fmt(ip),	27103	active_field_name.fmt(ip),
...	@@ -27124,11 +27124,11 @@ fn unionFieldPtr(	...	@@ -27124,11 +27124,11 @@ fn unionFieldPtr(
27124	if (!initializing and union_obj.getLayout(ip) == .Auto and block.wantSafety() and	27124	if (!initializing and union_obj.getLayout(ip) == .Auto and block.wantSafety() and
27125	union_ty.unionTagTypeSafety(mod) != null and union_obj.field_names.len > 1)	27125	union_ty.unionTagTypeSafety(mod) != null and union_obj.field_names.len > 1)
27126	{	27126	{
27127	const wanted_tag_val = try mod.enumValueFieldIndex(union_obj.enum_tag_ty.toType(), enum_field_index);	27127	const wanted_tag_val = try mod.enumValueFieldIndex(Type.fromInterned(union_obj.enum_tag_ty), enum_field_index);
27128	const wanted_tag = Air.internedToRef(wanted_tag_val.toIntern());	27128	const wanted_tag = Air.internedToRef(wanted_tag_val.toIntern());
27129	// TODO would it be better if get_union_tag supported pointers to unions?	27129	// TODO would it be better if get_union_tag supported pointers to unions?
27130	const union_val = try block.addTyOp(.load, union_ty, union_ptr);	27130	const union_val = try block.addTyOp(.load, union_ty, union_ptr);
27131	const active_tag = try block.addTyOp(.get_union_tag, union_obj.enum_tag_ty.toType(), union_val);	27131	const active_tag = try block.addTyOp(.get_union_tag, Type.fromInterned(union_obj.enum_tag_ty), union_val);
27132	try sema.panicInactiveUnionField(block, src, active_tag, wanted_tag);	27132	try sema.panicInactiveUnionField(block, src, active_tag, wanted_tag);
27133	}	27133	}
27134	if (field_ty.zigTypeTag(mod) == .NoReturn) {	27134	if (field_ty.zigTypeTag(mod) == .NoReturn) {
...	@@ -27154,14 +27154,14 @@ fn unionFieldVal(	...	@@ -27154,14 +27154,14 @@ fn unionFieldVal(
27154	try sema.resolveTypeFields(union_ty);	27154	try sema.resolveTypeFields(union_ty);
27155	const union_obj = mod.typeToUnion(union_ty).?;	27155	const union_obj = mod.typeToUnion(union_ty).?;
27156	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);	27156	const field_index = try sema.unionFieldIndex(block, union_ty, field_name, field_name_src);
27157	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	27157	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
27158	const enum_field_index: u32 = @intCast(union_obj.enum_tag_ty.toType().enumFieldIndex(field_name, mod).?);	27158	const enum_field_index: u32 = @intCast(Type.fromInterned(union_obj.enum_tag_ty).enumFieldIndex(field_name, mod).?);
27159		27159
27160	if (try sema.resolveValue(union_byval)) \|union_val\| {	27160	if (try sema.resolveValue(union_byval)) \|union_val\| {
27161	if (union_val.isUndef(mod)) return mod.undefRef(field_ty);	27161	if (union_val.isUndef(mod)) return mod.undefRef(field_ty);
27162		27162
27163	const un = ip.indexToKey(union_val.toIntern()).un;	27163	const un = ip.indexToKey(union_val.toIntern()).un;
27164	const field_tag = try mod.enumValueFieldIndex(union_obj.enum_tag_ty.toType(), enum_field_index);	27164	const field_tag = try mod.enumValueFieldIndex(Type.fromInterned(union_obj.enum_tag_ty), enum_field_index);
27165	const tag_matches = un.tag == field_tag.toIntern();	27165	const tag_matches = un.tag == field_tag.toIntern();
27166	switch (union_obj.getLayout(ip)) {	27166	switch (union_obj.getLayout(ip)) {
27167	.Auto => {	27167	.Auto => {
...	@@ -27169,8 +27169,8 @@ fn unionFieldVal(	...	@@ -27169,8 +27169,8 @@ fn unionFieldVal(
27169	return Air.internedToRef(un.val);	27169	return Air.internedToRef(un.val);
27170	} else {	27170	} else {
27171	const msg = msg: {	27171	const msg = msg: {
27172	const active_index = union_obj.enum_tag_ty.toType().enumTagFieldIndex(un.tag.toValue(), mod).?;	27172	const active_index = Type.fromInterned(union_obj.enum_tag_ty).enumTagFieldIndex(Value.fromInterned(un.tag), mod).?;
27173	const active_field_name = union_obj.enum_tag_ty.toType().enumFieldName(active_index, mod);	27173	const active_field_name = Type.fromInterned(union_obj.enum_tag_ty).enumFieldName(active_index, mod);
27174	const msg = try sema.errMsg(block, src, "access of union field '{}' while field '{}' is active", .{	27174	const msg = try sema.errMsg(block, src, "access of union field '{}' while field '{}' is active", .{
27175	field_name.fmt(ip), active_field_name.fmt(ip),	27175	field_name.fmt(ip), active_field_name.fmt(ip),
27176	});	27176	});
...	@@ -27186,11 +27186,11 @@ fn unionFieldVal(	...	@@ -27186,11 +27186,11 @@ fn unionFieldVal(
27186	return Air.internedToRef(un.val);	27186	return Air.internedToRef(un.val);
27187	} else {	27187	} else {
27188	const old_ty = if (un.tag == .none)	27188	const old_ty = if (un.tag == .none)
27189	ip.typeOf(un.val).toType()	27189	Type.fromInterned(ip.typeOf(un.val))
27190	else	27190	else
27191	union_ty.unionFieldType(un.tag.toValue(), mod).?;	27191	union_ty.unionFieldType(Value.fromInterned(un.tag), mod).?;
27192		27192
27193	if (try sema.bitCastUnionFieldVal(block, src, un.val.toValue(), old_ty, field_ty, layout)) \|new_val\| {	27193	if (try sema.bitCastUnionFieldVal(block, src, Value.fromInterned(un.val), old_ty, field_ty, layout)) \|new_val\| {
27194	return Air.internedToRef(new_val.toIntern());	27194	return Air.internedToRef(new_val.toIntern());
27195	}	27195	}
27196	}	27196	}
...	@@ -27202,9 +27202,9 @@ fn unionFieldVal(	...	@@ -27202,9 +27202,9 @@ fn unionFieldVal(
27202	if (union_obj.getLayout(ip) == .Auto and block.wantSafety() and	27202	if (union_obj.getLayout(ip) == .Auto and block.wantSafety() and
27203	union_ty.unionTagTypeSafety(mod) != null and union_obj.field_names.len > 1)	27203	union_ty.unionTagTypeSafety(mod) != null and union_obj.field_names.len > 1)
27204	{	27204	{
27205	const wanted_tag_val = try mod.enumValueFieldIndex(union_obj.enum_tag_ty.toType(), enum_field_index);	27205	const wanted_tag_val = try mod.enumValueFieldIndex(Type.fromInterned(union_obj.enum_tag_ty), enum_field_index);
27206	const wanted_tag = Air.internedToRef(wanted_tag_val.toIntern());	27206	const wanted_tag = Air.internedToRef(wanted_tag_val.toIntern());
27207	const active_tag = try block.addTyOp(.get_union_tag, union_obj.enum_tag_ty.toType(), union_byval);	27207	const active_tag = try block.addTyOp(.get_union_tag, Type.fromInterned(union_obj.enum_tag_ty), union_byval);
27208	try sema.panicInactiveUnionField(block, src, active_tag, wanted_tag);	27208	try sema.panicInactiveUnionField(block, src, active_tag, wanted_tag);
27209	}	27209	}
27210	if (field_ty.zigTypeTag(mod) == .NoReturn) {	27210	if (field_ty.zigTypeTag(mod) == .NoReturn) {
...	@@ -27906,7 +27906,7 @@ fn coerceExtra(	...	@@ -27906,7 +27906,7 @@ fn coerceExtra(
27906	if (!inst_ty.isSinglePointer(mod)) break :single_item;	27906	if (!inst_ty.isSinglePointer(mod)) break :single_item;
27907	if (!sema.checkPtrAttributes(dest_ty, inst_ty, &in_memory_result)) break :pointer;	27907	if (!sema.checkPtrAttributes(dest_ty, inst_ty, &in_memory_result)) break :pointer;
27908	const ptr_elem_ty = inst_ty.childType(mod);	27908	const ptr_elem_ty = inst_ty.childType(mod);
27909	const array_ty = dest_info.child.toType();	27909	const array_ty = Type.fromInterned(dest_info.child);
27910	if (array_ty.zigTypeTag(mod) != .Array) break :single_item;	27910	if (array_ty.zigTypeTag(mod) != .Array) break :single_item;
27911	const array_elem_ty = array_ty.childType(mod);	27911	const array_elem_ty = array_ty.childType(mod);
27912	if (array_ty.arrayLen(mod) != 1) break :single_item;	27912	if (array_ty.arrayLen(mod) != 1) break :single_item;
...	@@ -27927,7 +27927,7 @@ fn coerceExtra(	...	@@ -27927,7 +27927,7 @@ fn coerceExtra(
27927	const array_elem_type = array_ty.childType(mod);	27927	const array_elem_type = array_ty.childType(mod);
27928	const dest_is_mut = !dest_info.flags.is_const;	27928	const dest_is_mut = !dest_info.flags.is_const;
27929		27929
27930	const dst_elem_type = dest_info.child.toType();	27930	const dst_elem_type = Type.fromInterned(dest_info.child);
27931	const elem_res = try sema.coerceInMemoryAllowed(block, dst_elem_type, array_elem_type, dest_is_mut, target, dest_ty_src, inst_src);	27931	const elem_res = try sema.coerceInMemoryAllowed(block, dst_elem_type, array_elem_type, dest_is_mut, target, dest_ty_src, inst_src);
27932	switch (elem_res) {	27932	switch (elem_res) {
27933	.ok => {},	27933	.ok => {},
...	@@ -27948,7 +27948,7 @@ fn coerceExtra(	...	@@ -27948,7 +27948,7 @@ fn coerceExtra(
27948	{	27948	{
27949	in_memory_result = .{ .ptr_sentinel = .{	27949	in_memory_result = .{ .ptr_sentinel = .{
27950	.actual = inst_sent,	27950	.actual = inst_sent,
27951	.wanted = dest_info.sentinel.toValue(),	27951	.wanted = Value.fromInterned(dest_info.sentinel),
27952	.ty = dst_elem_type,	27952	.ty = dst_elem_type,
27953	} };	27953	} };
27954	break :src_array_ptr;	27954	break :src_array_ptr;
...	@@ -27956,7 +27956,7 @@ fn coerceExtra(	...	@@ -27956,7 +27956,7 @@ fn coerceExtra(
27956	} else {	27956	} else {
27957	in_memory_result = .{ .ptr_sentinel = .{	27957	in_memory_result = .{ .ptr_sentinel = .{
27958	.actual = Value.@"unreachable",	27958	.actual = Value.@"unreachable",
27959	.wanted = dest_info.sentinel.toValue(),	27959	.wanted = Value.fromInterned(dest_info.sentinel),
27960	.ty = dst_elem_type,	27960	.ty = dst_elem_type,
27961	} };	27961	} };
27962	break :src_array_ptr;	27962	break :src_array_ptr;
...	@@ -27988,7 +27988,7 @@ fn coerceExtra(	...	@@ -27988,7 +27988,7 @@ fn coerceExtra(
27988	// could be null.	27988	// could be null.
27989	const src_elem_ty = inst_ty.childType(mod);	27989	const src_elem_ty = inst_ty.childType(mod);
27990	const dest_is_mut = !dest_info.flags.is_const;	27990	const dest_is_mut = !dest_info.flags.is_const;
27991	const dst_elem_type = dest_info.child.toType();	27991	const dst_elem_type = Type.fromInterned(dest_info.child);
27992	switch (try sema.coerceInMemoryAllowed(block, dst_elem_type, src_elem_ty, dest_is_mut, target, dest_ty_src, inst_src)) {	27992	switch (try sema.coerceInMemoryAllowed(block, dst_elem_type, src_elem_ty, dest_is_mut, target, dest_ty_src, inst_src)) {
27993	.ok => {},	27993	.ok => {},
27994	else => break :src_c_ptr,	27994	else => break :src_c_ptr,
...	@@ -28053,8 +28053,8 @@ fn coerceExtra(	...	@@ -28053,8 +28053,8 @@ fn coerceExtra(
28053	const inst_info = inst_ty.ptrInfo(mod);	28053	const inst_info = inst_ty.ptrInfo(mod);
28054	switch (try sema.coerceInMemoryAllowed(	28054	switch (try sema.coerceInMemoryAllowed(
28055	block,	28055	block,
28056	dest_info.child.toType(),	28056	Type.fromInterned(dest_info.child),
28057	inst_info.child.toType(),	28057	Type.fromInterned(inst_info.child),
28058	!dest_info.flags.is_const,	28058	!dest_info.flags.is_const,
28059	target,	28059	target,
28060	dest_ty_src,	28060	dest_ty_src,
...	@@ -28066,7 +28066,7 @@ fn coerceExtra(	...	@@ -28066,7 +28066,7 @@ fn coerceExtra(
28066	if (inst_info.flags.size == .Slice) {	28066	if (inst_info.flags.size == .Slice) {
28067	assert(dest_info.sentinel == .none);	28067	assert(dest_info.sentinel == .none);
28068	if (inst_info.sentinel == .none or	28068	if (inst_info.sentinel == .none or
28069	inst_info.sentinel != (try mod.intValue(inst_info.child.toType(), 0)).toIntern())	28069	inst_info.sentinel != (try mod.intValue(Type.fromInterned(inst_info.child), 0)).toIntern())
28070	break :p;	28070	break :p;
28071		28071
28072	const slice_ptr = try sema.analyzeSlicePtr(block, inst_src, inst, inst_ty);	28072	const slice_ptr = try sema.analyzeSlicePtr(block, inst_src, inst, inst_ty);
...	@@ -28076,7 +28076,7 @@ fn coerceExtra(	...	@@ -28076,7 +28076,7 @@ fn coerceExtra(
28076	},	28076	},
28077	else => {},	28077	else => {},
28078	},	28078	},
28079	.One => switch (dest_info.child.toType().zigTypeTag(mod)) {	28079	.One => switch (Type.fromInterned(dest_info.child).zigTypeTag(mod)) {
28080	.Union => {	28080	.Union => {
28081	// pointer to anonymous struct to pointer to union	28081	// pointer to anonymous struct to pointer to union
28082	if (inst_ty.isSinglePointer(mod) and	28082	if (inst_ty.isSinglePointer(mod) and
...	@@ -28139,7 +28139,7 @@ fn coerceExtra(	...	@@ -28139,7 +28139,7 @@ fn coerceExtra(
28139	try mod.intern_pool.getCoercedInts(	28139	try mod.intern_pool.getCoercedInts(
28140	mod.gpa,	28140	mod.gpa,
28141	mod.intern_pool.indexToKey(	28141	mod.intern_pool.indexToKey(
28142	(try dest_info.child.toType().lazyAbiAlignment(mod)).toIntern(),	28142	(try Type.fromInterned(dest_info.child).lazyAbiAlignment(mod)).toIntern(),
28143	).int,	28143	).int,
28144	.usize_type,	28144	.usize_type,
28145	) },	28145	) },
...	@@ -28166,8 +28166,8 @@ fn coerceExtra(	...	@@ -28166,8 +28166,8 @@ fn coerceExtra(
28166		28166
28167	switch (try sema.coerceInMemoryAllowed(	28167	switch (try sema.coerceInMemoryAllowed(
28168	block,	28168	block,
28169	dest_info.child.toType(),	28169	Type.fromInterned(dest_info.child),
28170	inst_info.child.toType(),	28170	Type.fromInterned(inst_info.child),
28171	!dest_info.flags.is_const,	28171	!dest_info.flags.is_const,
28172	target,	28172	target,
28173	dest_ty_src,	28173	dest_ty_src,
...	@@ -28179,7 +28179,7 @@ fn coerceExtra(	...	@@ -28179,7 +28179,7 @@ fn coerceExtra(
28179		28179
28180	if (dest_info.sentinel == .none or inst_info.sentinel == .none or	28180	if (dest_info.sentinel == .none or inst_info.sentinel == .none or
28181	Air.internedToRef(dest_info.sentinel) !=	28181	Air.internedToRef(dest_info.sentinel) !=
28182	try sema.coerceInMemory(inst_info.sentinel.toValue(), dest_info.child.toType()))	28182	try sema.coerceInMemory(Value.fromInterned(inst_info.sentinel), Type.fromInterned(dest_info.child)))
28183	break :p;	28183	break :p;
28184		28184
28185	const slice_ptr = try sema.analyzeSlicePtr(block, inst_src, inst, inst_ty);	28185	const slice_ptr = try sema.analyzeSlicePtr(block, inst_src, inst, inst_ty);
...	@@ -29220,8 +29220,8 @@ fn coerceInMemoryAllowedFns(	...	@@ -29220,8 +29220,8 @@ fn coerceInMemoryAllowedFns(
29220	switch (src_info.return_type) {	29220	switch (src_info.return_type) {
29221	.noreturn_type, .generic_poison_type => {},	29221	.noreturn_type, .generic_poison_type => {},
29222	else => {	29222	else => {
29223	const dest_return_type = dest_info.return_type.toType();	29223	const dest_return_type = Type.fromInterned(dest_info.return_type);
29224	const src_return_type = src_info.return_type.toType();	29224	const src_return_type = Type.fromInterned(src_info.return_type);
29225	const rt = try sema.coerceInMemoryAllowed(block, dest_return_type, src_return_type, false, target, dest_src, src_src);	29225	const rt = try sema.coerceInMemoryAllowed(block, dest_return_type, src_return_type, false, target, dest_src, src_src);
29226	if (rt != .ok) {	29226	if (rt != .ok) {
29227	return InMemoryCoercionResult{ .fn_return_type = .{	29227	return InMemoryCoercionResult{ .fn_return_type = .{
...	@@ -29253,8 +29253,8 @@ fn coerceInMemoryAllowedFns(	...	@@ -29253,8 +29253,8 @@ fn coerceInMemoryAllowedFns(
29253	};	29253	};
29254		29254
29255	for (0..params_len) \|param_i\| {	29255	for (0..params_len) \|param_i\| {
29256	const dest_param_ty = dest_info.param_types.get(ip)[param_i].toType();	29256	const dest_param_ty = Type.fromInterned(dest_info.param_types.get(ip)[param_i]);
29257	const src_param_ty = src_info.param_types.get(ip)[param_i].toType();	29257	const src_param_ty = Type.fromInterned(src_info.param_types.get(ip)[param_i]);
29258		29258
29259	const param_i_small: u5 = @intCast(param_i);	29259	const param_i_small: u5 = @intCast(param_i);
29260	if (dest_info.paramIsComptime(param_i_small) != src_info.paramIsComptime(param_i_small)) {	29260	if (dest_info.paramIsComptime(param_i_small) != src_info.paramIsComptime(param_i_small)) {
...	@@ -29329,12 +29329,12 @@ fn coerceInMemoryAllowedPtrs(	...	@@ -29329,12 +29329,12 @@ fn coerceInMemoryAllowedPtrs(
29329	} };	29329	} };
29330	}	29330	}
29331		29331
29332	const child = try sema.coerceInMemoryAllowed(block, dest_info.child.toType(), src_info.child.toType(), !dest_info.flags.is_const, target, dest_src, src_src);	29332	const child = try sema.coerceInMemoryAllowed(block, Type.fromInterned(dest_info.child), Type.fromInterned(src_info.child), !dest_info.flags.is_const, target, dest_src, src_src);
29333	if (child != .ok) {	29333	if (child != .ok) {
29334	return InMemoryCoercionResult{ .ptr_child = .{	29334	return InMemoryCoercionResult{ .ptr_child = .{
29335	.child = try child.dupe(sema.arena),	29335	.child = try child.dupe(sema.arena),
29336	.actual = src_info.child.toType(),	29336	.actual = Type.fromInterned(src_info.child),
29337	.wanted = dest_info.child.toType(),	29337	.wanted = Type.fromInterned(dest_info.child),
29338	} };	29338	} };
29339	}	29339	}
29340		29340
...	@@ -29369,13 +29369,13 @@ fn coerceInMemoryAllowedPtrs(	...	@@ -29369,13 +29369,13 @@ fn coerceInMemoryAllowedPtrs(
29369	return InMemoryCoercionResult{ .ptr_sentinel = .{	29369	return InMemoryCoercionResult{ .ptr_sentinel = .{
29370	.actual = switch (src_info.sentinel) {	29370	.actual = switch (src_info.sentinel) {
29371	.none => Value.@"unreachable",	29371	.none => Value.@"unreachable",
29372	else => src_info.sentinel.toValue(),	29372	else => Value.fromInterned(src_info.sentinel),
29373	},	29373	},
29374	.wanted = switch (dest_info.sentinel) {	29374	.wanted = switch (dest_info.sentinel) {
29375	.none => Value.@"unreachable",	29375	.none => Value.@"unreachable",
29376	else => dest_info.sentinel.toValue(),	29376	else => Value.fromInterned(dest_info.sentinel),
29377	},	29377	},
29378	.ty = dest_info.child.toType(),	29378	.ty = Type.fromInterned(dest_info.child),
29379	} };	29379	} };
29380	}	29380	}
29381		29381
...	@@ -29389,12 +29389,12 @@ fn coerceInMemoryAllowedPtrs(	...	@@ -29389,12 +29389,12 @@ fn coerceInMemoryAllowedPtrs(
29389	const src_align = if (src_info.flags.alignment != .none)	29389	const src_align = if (src_info.flags.alignment != .none)
29390	src_info.flags.alignment	29390	src_info.flags.alignment
29391	else	29391	else
29392	try sema.typeAbiAlignment(src_info.child.toType());	29392	try sema.typeAbiAlignment(Type.fromInterned(src_info.child));
29393		29393
29394	const dest_align = if (dest_info.flags.alignment != .none)	29394	const dest_align = if (dest_info.flags.alignment != .none)
29395	dest_info.flags.alignment	29395	dest_info.flags.alignment
29396	else	29396	else
29397	try sema.typeAbiAlignment(dest_info.child.toType());	29397	try sema.typeAbiAlignment(Type.fromInterned(dest_info.child));
29398		29398
29399	if (dest_align.compare(.gt, src_align)) {	29399	if (dest_align.compare(.gt, src_align)) {
29400	return InMemoryCoercionResult{ .ptr_alignment = .{	29400	return InMemoryCoercionResult{ .ptr_alignment = .{
...	@@ -29719,14 +29719,14 @@ fn storePtrVal(	...	@@ -29719,14 +29719,14 @@ fn storePtrVal(
29719	.opv => {},	29719	.opv => {},
29720	.direct => \|val_ptr\| {	29720	.direct => \|val_ptr\| {
29721	if (mut_kit.mut_decl.runtime_index == .comptime_field_ptr) {	29721	if (mut_kit.mut_decl.runtime_index == .comptime_field_ptr) {
29722	val_ptr.* = (try val_ptr.intern(operand_ty, mod)).toValue();	29722	val_ptr.* = Value.fromInterned((try val_ptr.intern(operand_ty, mod)));
29723	if (!operand_val.eql(val_ptr.*, operand_ty, mod)) {	29723	if (!operand_val.eql(val_ptr.*, operand_ty, mod)) {
29724	// TODO use failWithInvalidComptimeFieldStore	29724	// TODO use failWithInvalidComptimeFieldStore
29725	return sema.fail(block, src, "value stored in comptime field does not match the default value of the field", .{});	29725	return sema.fail(block, src, "value stored in comptime field does not match the default value of the field", .{});
29726	}	29726	}
29727	return;	29727	return;
29728	}	29728	}
29729	val_ptr.* = (try operand_val.intern(operand_ty, mod)).toValue();	29729	val_ptr.* = Value.fromInterned((try operand_val.intern(operand_ty, mod)));
29730	},	29730	},
29731	.reinterpret => \|reinterpret\| {	29731	.reinterpret => \|reinterpret\| {
29732	const abi_size = try sema.usizeCast(block, src, mut_kit.ty.abiSize(mod));	29732	const abi_size = try sema.usizeCast(block, src, mut_kit.ty.abiSize(mod));
...	@@ -29756,7 +29756,7 @@ fn storePtrVal(	...	@@ -29756,7 +29756,7 @@ fn storePtrVal(
29756	error.IllDefinedMemoryLayout => unreachable,	29756	error.IllDefinedMemoryLayout => unreachable,
29757	error.Unimplemented => return sema.fail(block, src, "TODO: implement readFromMemory for type '{}'", .{mut_kit.ty.fmt(mod)}),	29757	error.Unimplemented => return sema.fail(block, src, "TODO: implement readFromMemory for type '{}'", .{mut_kit.ty.fmt(mod)}),
29758	};	29758	};
29759	reinterpret.val_ptr.* = (try val.intern(mut_kit.ty, mod)).toValue();	29759	reinterpret.val_ptr.* = Value.fromInterned((try val.intern(mut_kit.ty, mod)));
29760	},	29760	},
29761	.bad_decl_ty, .bad_ptr_ty => {	29761	.bad_decl_ty, .bad_ptr_ty => {
29762	// TODO show the decl declaration site in a note and explain whether the decl	29762	// TODO show the decl declaration site in a note and explain whether the decl
...	@@ -29817,15 +29817,15 @@ fn beginComptimePtrMutation(	...	@@ -29817,15 +29817,15 @@ fn beginComptimePtrMutation(
29817	},	29817	},
29818	.comptime_field => \|comptime_field\| {	29818	.comptime_field => \|comptime_field\| {
29819	const duped = try sema.arena.create(Value);	29819	const duped = try sema.arena.create(Value);
29820	duped.* = comptime_field.toValue();	29820	duped.* = Value.fromInterned(comptime_field);
29821	return sema.beginComptimePtrMutationInner(block, src, mod.intern_pool.typeOf(comptime_field).toType(), duped, ptr_elem_ty, .{	29821	return sema.beginComptimePtrMutationInner(block, src, Type.fromInterned(mod.intern_pool.typeOf(comptime_field)), duped, ptr_elem_ty, .{
29822	.decl = undefined,	29822	.decl = undefined,
29823	.runtime_index = .comptime_field_ptr,	29823	.runtime_index = .comptime_field_ptr,
29824	});	29824	});
29825	},	29825	},
29826	.eu_payload => \|eu_ptr\| {	29826	.eu_payload => \|eu_ptr\| {
29827	const eu_ty = mod.intern_pool.typeOf(eu_ptr).toType().childType(mod);	29827	const eu_ty = Type.fromInterned(mod.intern_pool.typeOf(eu_ptr)).childType(mod);
29828	var parent = try sema.beginComptimePtrMutation(block, src, eu_ptr.toValue(), eu_ty);	29828	var parent = try sema.beginComptimePtrMutation(block, src, Value.fromInterned(eu_ptr), eu_ty);
29829	switch (parent.pointee) {	29829	switch (parent.pointee) {
29830	.opv => unreachable,	29830	.opv => unreachable,
29831	.direct => \|val_ptr\| {	29831	.direct => \|val_ptr\| {
...	@@ -29844,7 +29844,7 @@ fn beginComptimePtrMutation(	...	@@ -29844,7 +29844,7 @@ fn beginComptimePtrMutation(
29844	const payload = try sema.arena.create(Value.Payload.SubValue);	29844	const payload = try sema.arena.create(Value.Payload.SubValue);
29845	payload.* = .{	29845	payload.* = .{
29846	.base = .{ .tag = .eu_payload },	29846	.base = .{ .tag = .eu_payload },
29847	.data = (try mod.intern(.{ .undef = payload_ty.toIntern() })).toValue(),	29847	.data = Value.fromInterned((try mod.intern(.{ .undef = payload_ty.toIntern() }))),
29848	};	29848	};
29849		29849
29850	val_ptr.* = Value.initPayload(&payload.base);	29850	val_ptr.* = Value.initPayload(&payload.base);
...	@@ -29867,8 +29867,8 @@ fn beginComptimePtrMutation(	...	@@ -29867,8 +29867,8 @@ fn beginComptimePtrMutation(
29867	}	29867	}
29868	},	29868	},
29869	.opt_payload => \|opt_ptr\| {	29869	.opt_payload => \|opt_ptr\| {
29870	const opt_ty = mod.intern_pool.typeOf(opt_ptr).toType().childType(mod);	29870	const opt_ty = Type.fromInterned(mod.intern_pool.typeOf(opt_ptr)).childType(mod);
29871	var parent = try sema.beginComptimePtrMutation(block, src, opt_ptr.toValue(), opt_ty);	29871	var parent = try sema.beginComptimePtrMutation(block, src, Value.fromInterned(opt_ptr), opt_ty);
29872	switch (parent.pointee) {	29872	switch (parent.pointee) {
29873	.opv => unreachable,	29873	.opv => unreachable,
29874	.direct => \|val_ptr\| {	29874	.direct => \|val_ptr\| {
...	@@ -29896,7 +29896,7 @@ fn beginComptimePtrMutation(	...	@@ -29896,7 +29896,7 @@ fn beginComptimePtrMutation(
29896	const payload = try sema.arena.create(Value.Payload.SubValue);	29896	const payload = try sema.arena.create(Value.Payload.SubValue);
29897	payload.* = .{	29897	payload.* = .{
29898	.base = .{ .tag = .opt_payload },	29898	.base = .{ .tag = .opt_payload },
29899	.data = payload_val.toValue(),	29899	.data = Value.fromInterned(payload_val),
29900	};	29900	};
29901		29901
29902	val_ptr.* = Value.initPayload(&payload.base);	29902	val_ptr.* = Value.initPayload(&payload.base);
...	@@ -29920,8 +29920,8 @@ fn beginComptimePtrMutation(	...	@@ -29920,8 +29920,8 @@ fn beginComptimePtrMutation(
29920	}	29920	}
29921	},	29921	},
29922	.elem => \|elem_ptr\| {	29922	.elem => \|elem_ptr\| {
29923	const base_elem_ty = mod.intern_pool.typeOf(elem_ptr.base).toType().elemType2(mod);	29923	const base_elem_ty = Type.fromInterned(mod.intern_pool.typeOf(elem_ptr.base)).elemType2(mod);
29924	var parent = try sema.beginComptimePtrMutation(block, src, elem_ptr.base.toValue(), base_elem_ty);	29924	var parent = try sema.beginComptimePtrMutation(block, src, Value.fromInterned(elem_ptr.base), base_elem_ty);
29925		29925
29926	switch (parent.pointee) {	29926	switch (parent.pointee) {
29927	.opv => unreachable,	29927	.opv => unreachable,
...	@@ -30017,7 +30017,7 @@ fn beginComptimePtrMutation(	...	@@ -30017,7 +30017,7 @@ fn beginComptimePtrMutation(
30017	const array_len_including_sentinel =	30017	const array_len_including_sentinel =
30018	try sema.usizeCast(block, src, parent.ty.arrayLenIncludingSentinel(mod));	30018	try sema.usizeCast(block, src, parent.ty.arrayLenIncludingSentinel(mod));
30019	const elems = try arena.alloc(Value, array_len_including_sentinel);	30019	const elems = try arena.alloc(Value, array_len_including_sentinel);
30020	@memset(elems, repeated_val.toValue());	30020	@memset(elems, Value.fromInterned(repeated_val));
30021		30021
30022	val_ptr.* = try Value.Tag.aggregate.create(arena, elems);	30022	val_ptr.* = try Value.Tag.aggregate.create(arena, elems);
30023		30023
...	@@ -30054,7 +30054,7 @@ fn beginComptimePtrMutation(	...	@@ -30054,7 +30054,7 @@ fn beginComptimePtrMutation(
30054	const array_len_including_sentinel =	30054	const array_len_including_sentinel =
30055	try sema.usizeCast(block, src, parent.ty.arrayLenIncludingSentinel(mod));	30055	try sema.usizeCast(block, src, parent.ty.arrayLenIncludingSentinel(mod));
30056	const elems = try arena.alloc(Value, array_len_including_sentinel);	30056	const elems = try arena.alloc(Value, array_len_including_sentinel);
30057	@memset(elems, (try mod.intern(.{ .undef = elem_ty.toIntern() })).toValue());	30057	@memset(elems, Value.fromInterned((try mod.intern(.{ .undef = elem_ty.toIntern() }))));
30058		30058
30059	val_ptr.* = try Value.Tag.aggregate.create(arena, elems);	30059	val_ptr.* = try Value.Tag.aggregate.create(arena, elems);
30060		30060
...	@@ -30117,10 +30117,10 @@ fn beginComptimePtrMutation(	...	@@ -30117,10 +30117,10 @@ fn beginComptimePtrMutation(
30117	}	30117	}
30118	},	30118	},
30119	.field => \|field_ptr\| {	30119	.field => \|field_ptr\| {
30120	const base_child_ty = mod.intern_pool.typeOf(field_ptr.base).toType().childType(mod);	30120	const base_child_ty = Type.fromInterned(mod.intern_pool.typeOf(field_ptr.base)).childType(mod);
30121	const field_index: u32 = @intCast(field_ptr.index);	30121	const field_index: u32 = @intCast(field_ptr.index);
30122		30122
30123	var parent = try sema.beginComptimePtrMutation(block, src, field_ptr.base.toValue(), base_child_ty);	30123	var parent = try sema.beginComptimePtrMutation(block, src, Value.fromInterned(field_ptr.base), base_child_ty);
30124	switch (parent.pointee) {	30124	switch (parent.pointee) {
30125	.opv => unreachable,	30125	.opv => unreachable,
30126	.direct => \|val_ptr\| switch (val_ptr.ip_index) {	30126	.direct => \|val_ptr\| switch (val_ptr.ip_index) {
...	@@ -30238,9 +30238,9 @@ fn beginComptimePtrMutation(	...	@@ -30238,9 +30238,9 @@ fn beginComptimePtrMutation(
30238	switch (parent.ty.zigTypeTag(mod)) {	30238	switch (parent.ty.zigTypeTag(mod)) {
30239	.Struct => {	30239	.Struct => {
30240	const fields = try arena.alloc(Value, parent.ty.structFieldCount(mod));	30240	const fields = try arena.alloc(Value, parent.ty.structFieldCount(mod));
30241	for (fields, 0..) \|field, i\| field. = (try mod.intern(.{	30241	for (fields, 0..) \|field, i\| field. = Value.fromInterned((try mod.intern(.{
30242	.undef = parent.ty.structFieldType(i, mod).toIntern(),	30242	.undef = parent.ty.structFieldType(i, mod).toIntern(),
30243	})).toValue();	30243	})));
30244		30244
30245	val_ptr.* = try Value.Tag.aggregate.create(arena, fields);	30245	val_ptr.* = try Value.Tag.aggregate.create(arena, fields);
30246		30246
...	@@ -30260,7 +30260,7 @@ fn beginComptimePtrMutation(	...	@@ -30260,7 +30260,7 @@ fn beginComptimePtrMutation(
30260	const payload_ty = parent.ty.structFieldType(field_index, mod);	30260	const payload_ty = parent.ty.structFieldType(field_index, mod);
30261	payload.* = .{ .data = .{	30261	payload.* = .{ .data = .{
30262	.tag = try mod.enumValueFieldIndex(tag_ty, field_index),	30262	.tag = try mod.enumValueFieldIndex(tag_ty, field_index),
30263	.val = (try mod.intern(.{ .undef = payload_ty.toIntern() })).toValue(),	30263	.val = Value.fromInterned((try mod.intern(.{ .undef = payload_ty.toIntern() }))),
30264	} };	30264	} };
30265		30265
30266	val_ptr.* = Value.initPayload(&payload.base);	30266	val_ptr.* = Value.initPayload(&payload.base);
...	@@ -30279,8 +30279,8 @@ fn beginComptimePtrMutation(	...	@@ -30279,8 +30279,8 @@ fn beginComptimePtrMutation(
30279	assert(parent.ty.isSlice(mod));	30279	assert(parent.ty.isSlice(mod));
30280	const ptr_ty = parent.ty.slicePtrFieldType(mod);	30280	const ptr_ty = parent.ty.slicePtrFieldType(mod);
30281	val_ptr.* = try Value.Tag.slice.create(arena, .{	30281	val_ptr.* = try Value.Tag.slice.create(arena, .{
30282	.ptr = (try mod.intern(.{ .undef = ptr_ty.toIntern() })).toValue(),	30282	.ptr = Value.fromInterned((try mod.intern(.{ .undef = ptr_ty.toIntern() }))),
30283	.len = (try mod.intern(.{ .undef = .usize_type })).toValue(),	30283	.len = Value.fromInterned((try mod.intern(.{ .undef = .usize_type }))),
30284	});	30284	});
30285		30285
30286	switch (field_index) {	30286	switch (field_index) {
...	@@ -30449,9 +30449,9 @@ fn beginComptimePtrLoad(	...	@@ -30449,9 +30449,9 @@ fn beginComptimePtrLoad(
30449	},	30449	},
30450	.anon_decl => \|anon_decl\| blk: {	30450	.anon_decl => \|anon_decl\| blk: {
30451	const decl_val = anon_decl.val;	30451	const decl_val = anon_decl.val;
30452	if (decl_val.toValue().getVariable(mod) != null) return error.RuntimeLoad;	30452	if (Value.fromInterned(decl_val).getVariable(mod) != null) return error.RuntimeLoad;
30453	const decl_ty = ip.typeOf(decl_val).toType();	30453	const decl_ty = Type.fromInterned(ip.typeOf(decl_val));
30454	const decl_tv: TypedValue = .{ .ty = decl_ty, .val = decl_val.toValue() };	30454	const decl_tv: TypedValue = .{ .ty = decl_ty, .val = Value.fromInterned(decl_val) };
30455	const layout_defined = decl_ty.hasWellDefinedLayout(mod);	30455	const layout_defined = decl_ty.hasWellDefinedLayout(mod);
30456	break :blk ComptimePtrLoadKit{	30456	break :blk ComptimePtrLoadKit{
30457	.parent = if (layout_defined) .{ .tv = decl_tv, .byte_offset = 0 } else null,	30457	.parent = if (layout_defined) .{ .tv = decl_tv, .byte_offset = 0 } else null,
...	@@ -30462,13 +30462,13 @@ fn beginComptimePtrLoad(	...	@@ -30462,13 +30462,13 @@ fn beginComptimePtrLoad(
30462	},	30462	},
30463	.int => return error.RuntimeLoad,	30463	.int => return error.RuntimeLoad,
30464	.eu_payload, .opt_payload => \|container_ptr\| blk: {	30464	.eu_payload, .opt_payload => \|container_ptr\| blk: {
30465	const container_ty = ip.typeOf(container_ptr).toType().childType(mod);	30465	const container_ty = Type.fromInterned(ip.typeOf(container_ptr)).childType(mod);
30466	const payload_ty = switch (ptr.addr) {	30466	const payload_ty = switch (ptr.addr) {
30467	.eu_payload => container_ty.errorUnionPayload(mod),	30467	.eu_payload => container_ty.errorUnionPayload(mod),
30468	.opt_payload => container_ty.optionalChild(mod),	30468	.opt_payload => container_ty.optionalChild(mod),
30469	else => unreachable,	30469	else => unreachable,
30470	};	30470	};
30471	var deref = try sema.beginComptimePtrLoad(block, src, container_ptr.toValue(), container_ty);	30471	var deref = try sema.beginComptimePtrLoad(block, src, Value.fromInterned(container_ptr), container_ty);
30472		30472
30473	// eu_payload and opt_payload never have a well-defined layout	30473	// eu_payload and opt_payload never have a well-defined layout
30474	if (deref.parent != null) {	30474	if (deref.parent != null) {
...	@@ -30484,7 +30484,7 @@ fn beginComptimePtrLoad(	...	@@ -30484,7 +30484,7 @@ fn beginComptimePtrLoad(
30484	const payload_val = switch (tv.val.ip_index) {	30484	const payload_val = switch (tv.val.ip_index) {
30485	.none => tv.val.cast(Value.Payload.SubValue).?.data,	30485	.none => tv.val.cast(Value.Payload.SubValue).?.data,
30486	.null_value => return sema.fail(block, src, "attempt to use null value", .{}),	30486	.null_value => return sema.fail(block, src, "attempt to use null value", .{}),
30487	else => switch (ip.indexToKey(tv.val.toIntern())) {	30487	else => Value.fromInterned(switch (ip.indexToKey(tv.val.toIntern())) {
30488	.error_union => \|error_union\| switch (error_union.val) {	30488	.error_union => \|error_union\| switch (error_union.val) {
30489	.err_name => \|err_name\| return sema.fail(	30489	.err_name => \|err_name\| return sema.fail(
30490	block,	30490	block,
...	@@ -30499,7 +30499,7 @@ fn beginComptimePtrLoad(	...	@@ -30499,7 +30499,7 @@ fn beginComptimePtrLoad(
30499	else => \|payload\| payload,	30499	else => \|payload\| payload,
30500	},	30500	},
30501	else => unreachable,	30501	else => unreachable,
30502	}.toValue(),	30502	}),
30503	};	30503	};
30504	tv.* = TypedValue{ .ty = payload_ty, .val = payload_val };	30504	tv.* = TypedValue{ .ty = payload_ty, .val = payload_val };
30505	break :blk deref;	30505	break :blk deref;
...	@@ -30509,24 +30509,24 @@ fn beginComptimePtrLoad(	...	@@ -30509,24 +30509,24 @@ fn beginComptimePtrLoad(
30509	break :blk deref;	30509	break :blk deref;
30510	},	30510	},
30511	.comptime_field => \|comptime_field\| blk: {	30511	.comptime_field => \|comptime_field\| blk: {
30512	const field_ty = ip.typeOf(comptime_field).toType();	30512	const field_ty = Type.fromInterned(ip.typeOf(comptime_field));
30513	break :blk ComptimePtrLoadKit{	30513	break :blk ComptimePtrLoadKit{
30514	.parent = null,	30514	.parent = null,
30515	.pointee = .{ .ty = field_ty, .val = comptime_field.toValue() },	30515	.pointee = .{ .ty = field_ty, .val = Value.fromInterned(comptime_field) },
30516	.is_mutable = false,	30516	.is_mutable = false,
30517	.ty_without_well_defined_layout = field_ty,	30517	.ty_without_well_defined_layout = field_ty,
30518	};	30518	};
30519	},	30519	},
30520	.elem => \|elem_ptr\| blk: {	30520	.elem => \|elem_ptr\| blk: {
30521	const elem_ty = ip.typeOf(elem_ptr.base).toType().elemType2(mod);	30521	const elem_ty = Type.fromInterned(ip.typeOf(elem_ptr.base)).elemType2(mod);
30522	var deref = try sema.beginComptimePtrLoad(block, src, elem_ptr.base.toValue(), null);	30522	var deref = try sema.beginComptimePtrLoad(block, src, Value.fromInterned(elem_ptr.base), null);
30523		30523
30524	// This code assumes that elem_ptrs have been "flattened" in order for direct dereference	30524	// This code assumes that elem_ptrs have been "flattened" in order for direct dereference
30525	// to succeed, meaning that elem ptrs of the same elem_ty are coalesced. Here we check that	30525	// to succeed, meaning that elem ptrs of the same elem_ty are coalesced. Here we check that
30526	// our parent is not an elem_ptr with the same elem_ty, since that would be "unflattened"	30526	// our parent is not an elem_ptr with the same elem_ty, since that would be "unflattened"
30527	switch (ip.indexToKey(elem_ptr.base)) {	30527	switch (ip.indexToKey(elem_ptr.base)) {
30528	.ptr => \|base_ptr\| switch (base_ptr.addr) {	30528	.ptr => \|base_ptr\| switch (base_ptr.addr) {
30529	.elem => \|base_elem\| assert(!ip.typeOf(base_elem.base).toType().elemType2(mod).eql(elem_ty, mod)),	30529	.elem => \|base_elem\| assert(!Type.fromInterned(ip.typeOf(base_elem.base)).elemType2(mod).eql(elem_ty, mod)),
30530	else => {},	30530	else => {},
30531	},	30531	},
30532	else => {},	30532	else => {},
...	@@ -30598,8 +30598,8 @@ fn beginComptimePtrLoad(	...	@@ -30598,8 +30598,8 @@ fn beginComptimePtrLoad(
30598	},	30598	},
30599	.field => \|field_ptr\| blk: {	30599	.field => \|field_ptr\| blk: {
30600	const field_index: u32 = @intCast(field_ptr.index);	30600	const field_index: u32 = @intCast(field_ptr.index);
30601	const container_ty = ip.typeOf(field_ptr.base).toType().childType(mod);	30601	const container_ty = Type.fromInterned(ip.typeOf(field_ptr.base)).childType(mod);
30602	var deref = try sema.beginComptimePtrLoad(block, src, field_ptr.base.toValue(), container_ty);	30602	var deref = try sema.beginComptimePtrLoad(block, src, Value.fromInterned(field_ptr.base), container_ty);
30603		30603
30604	if (container_ty.hasWellDefinedLayout(mod)) {	30604	if (container_ty.hasWellDefinedLayout(mod)) {
30605	const struct_obj = mod.typeToStruct(container_ty);	30605	const struct_obj = mod.typeToStruct(container_ty);
...	@@ -30637,7 +30637,7 @@ fn beginComptimePtrLoad(	...	@@ -30637,7 +30637,7 @@ fn beginComptimePtrLoad(
30637	},	30637	},
30638	Value.slice_len_index => TypedValue{	30638	Value.slice_len_index => TypedValue{
30639	.ty = Type.usize,	30639	.ty = Type.usize,
30640	.val = ip.indexToKey(try tv.val.intern(tv.ty, mod)).ptr.len.toValue(),	30640	.val = Value.fromInterned(ip.indexToKey(try tv.val.intern(tv.ty, mod)).ptr.len),
30641	},	30641	},
30642	else => unreachable,	30642	else => unreachable,
30643	};	30643	};
...	@@ -30653,7 +30653,7 @@ fn beginComptimePtrLoad(	...	@@ -30653,7 +30653,7 @@ fn beginComptimePtrLoad(
30653	},	30653	},
30654	.opt => \|opt\| switch (opt.val) {	30654	.opt => \|opt\| switch (opt.val) {
30655	.none => return sema.fail(block, src, "attempt to use null value", .{}),	30655	.none => return sema.fail(block, src, "attempt to use null value", .{}),
30656	else => \|payload\| try sema.beginComptimePtrLoad(block, src, payload.toValue(), null),	30656	else => \|payload\| try sema.beginComptimePtrLoad(block, src, Value.fromInterned(payload), null),
30657	},	30657	},
30658	else => unreachable,	30658	else => unreachable,
30659	};	30659	};
...	@@ -30822,9 +30822,9 @@ fn checkPtrAttributes(sema: *Sema, dest_ty: Type, inst_ty: Type, in_memory_resul	...	@@ -30822,9 +30822,9 @@ fn checkPtrAttributes(sema: *Sema, dest_ty: Type, inst_ty: Type, in_memory_resul
30822	const mod = sema.mod;	30822	const mod = sema.mod;
30823	const dest_info = dest_ty.ptrInfo(mod);	30823	const dest_info = dest_ty.ptrInfo(mod);
30824	const inst_info = inst_ty.ptrInfo(mod);	30824	const inst_info = inst_ty.ptrInfo(mod);
30825	const len0 = (inst_info.child.toType().zigTypeTag(mod) == .Array and (inst_info.child.toType().arrayLenIncludingSentinel(mod) == 0 or	30825	const len0 = (Type.fromInterned(inst_info.child).zigTypeTag(mod) == .Array and (Type.fromInterned(inst_info.child).arrayLenIncludingSentinel(mod) == 0 or
30826	(inst_info.child.toType().arrayLen(mod) == 0 and dest_info.sentinel == .none and dest_info.flags.size != .C and dest_info.flags.size != .Many))) or	30826	(Type.fromInterned(inst_info.child).arrayLen(mod) == 0 and dest_info.sentinel == .none and dest_info.flags.size != .C and dest_info.flags.size != .Many))) or
30827	(inst_info.child.toType().isTuple(mod) and inst_info.child.toType().structFieldCount(mod) == 0);	30827	(Type.fromInterned(inst_info.child).isTuple(mod) and Type.fromInterned(inst_info.child).structFieldCount(mod) == 0);
30828		30828
30829	const ok_cv_qualifiers =	30829	const ok_cv_qualifiers =
30830	((!inst_info.flags.is_const or dest_info.flags.is_const) or len0) and	30830	((!inst_info.flags.is_const or dest_info.flags.is_const) or len0) and
...	@@ -30852,12 +30852,12 @@ fn checkPtrAttributes(sema: *Sema, dest_ty: Type, inst_ty: Type, in_memory_resul	...	@@ -30852,12 +30852,12 @@ fn checkPtrAttributes(sema: *Sema, dest_ty: Type, inst_ty: Type, in_memory_resul
30852	const inst_align = if (inst_info.flags.alignment != .none)	30852	const inst_align = if (inst_info.flags.alignment != .none)
30853	inst_info.flags.alignment	30853	inst_info.flags.alignment
30854	else	30854	else
30855	inst_info.child.toType().abiAlignment(mod);	30855	Type.fromInterned(inst_info.child).abiAlignment(mod);
30856		30856
30857	const dest_align = if (dest_info.flags.alignment != .none)	30857	const dest_align = if (dest_info.flags.alignment != .none)
30858	dest_info.flags.alignment	30858	dest_info.flags.alignment
30859	else	30859	else
30860	dest_info.child.toType().abiAlignment(mod);	30860	Type.fromInterned(dest_info.child).abiAlignment(mod);
30861		30861
30862	if (dest_align.compare(.gt, inst_align)) {	30862	if (dest_align.compare(.gt, inst_align)) {
30863	in_memory_result.* = .{ .ptr_alignment = .{	30863	in_memory_result.* = .{ .ptr_alignment = .{
...	@@ -30884,7 +30884,7 @@ fn coerceCompatiblePtrs(	...	@@ -30884,7 +30884,7 @@ fn coerceCompatiblePtrs(
30884	}	30884	}
30885	// The comptime Value representation is compatible with both types.	30885	// The comptime Value representation is compatible with both types.
30886	return Air.internedToRef(	30886	return Air.internedToRef(
30887	(try mod.getCoerced((try val.intern(inst_ty, mod)).toValue(), dest_ty)).toIntern(),	30887	(try mod.getCoerced(Value.fromInterned((try val.intern(inst_ty, mod))), dest_ty)).toIntern(),
30888	);	30888	);
30889	}	30889	}
30890	try sema.requireRuntimeBlock(block, inst_src, null);	30890	try sema.requireRuntimeBlock(block, inst_src, null);
...	@@ -30950,7 +30950,7 @@ fn coerceEnumToUnion(	...	@@ -30950,7 +30950,7 @@ fn coerceEnumToUnion(
30950	};	30950	};
30951		30951
30952	const union_obj = mod.typeToUnion(union_ty).?;	30952	const union_obj = mod.typeToUnion(union_ty).?;
30953	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	30953	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
30954	try sema.resolveTypeFields(field_ty);	30954	try sema.resolveTypeFields(field_ty);
30955	if (field_ty.zigTypeTag(mod) == .NoReturn) {	30955	if (field_ty.zigTypeTag(mod) == .NoReturn) {
30956	const msg = msg: {	30956	const msg = msg: {
...	@@ -31007,7 +31007,7 @@ fn coerceEnumToUnion(	...	@@ -31007,7 +31007,7 @@ fn coerceEnumToUnion(
31007	errdefer if (msg) \|some\| some.destroy(sema.gpa);	31007	errdefer if (msg) \|some\| some.destroy(sema.gpa);
31008		31008
31009	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {	31009	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {
31010	if (field_ty.toType().zigTypeTag(mod) == .NoReturn) {	31010	if (Type.fromInterned(field_ty).zigTypeTag(mod) == .NoReturn) {
31011	const err_msg = msg orelse try sema.errMsg(	31011	const err_msg = msg orelse try sema.errMsg(
31012	block,	31012	block,
31013	inst_src,	31013	inst_src,
...	@@ -31042,7 +31042,7 @@ fn coerceEnumToUnion(	...	@@ -31042,7 +31042,7 @@ fn coerceEnumToUnion(
31042		31042
31043	for (0..union_obj.field_names.len) \|field_index\| {	31043	for (0..union_obj.field_names.len) \|field_index\| {
31044	const field_name = union_obj.field_names.get(ip)[field_index];	31044	const field_name = union_obj.field_names.get(ip)[field_index];
31045	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	31045	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
31046	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;	31046	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;
31047	try sema.addFieldErrNote(union_ty, field_index, msg, "field '{}' has type '{}'", .{	31047	try sema.addFieldErrNote(union_ty, field_index, msg, "field '{}' has type '{}'", .{
31048	field_name.fmt(ip),	31048	field_name.fmt(ip),
...	@@ -31320,7 +31320,7 @@ fn coerceTupleToArrayPtrs(	...	@@ -31320,7 +31320,7 @@ fn coerceTupleToArrayPtrs(
31320	const mod = sema.mod;	31320	const mod = sema.mod;
31321	const tuple = try sema.analyzeLoad(block, tuple_src, ptr_tuple, tuple_src);	31321	const tuple = try sema.analyzeLoad(block, tuple_src, ptr_tuple, tuple_src);
31322	const ptr_info = ptr_array_ty.ptrInfo(mod);	31322	const ptr_info = ptr_array_ty.ptrInfo(mod);
31323	const array_ty = ptr_info.child.toType();	31323	const array_ty = Type.fromInterned(ptr_info.child);
31324	const array_inst = try sema.coerceTupleToArray(block, array_ty, array_ty_src, tuple, tuple_src);	31324	const array_inst = try sema.coerceTupleToArray(block, array_ty, array_ty_src, tuple, tuple_src);
31325	if (ptr_info.flags.alignment != .none) {	31325	if (ptr_info.flags.alignment != .none) {
31326	return sema.fail(block, array_ty_src, "TODO: override the alignment of the array decl we create here", .{});	31326	return sema.fail(block, array_ty_src, "TODO: override the alignment of the array decl we create here", .{});
...	@@ -31372,7 +31372,7 @@ fn coerceTupleToStruct(	...	@@ -31372,7 +31372,7 @@ fn coerceTupleToStruct(
31372	else => unreachable,	31372	else => unreachable,
31373	};	31373	};
31374	const field_index = try sema.structFieldIndex(block, struct_ty, field_name, field_src);	31374	const field_index = try sema.structFieldIndex(block, struct_ty, field_name, field_src);
31375	const field_ty = struct_type.field_types.get(ip)[field_index].toType();	31375	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
31376	const elem_ref = try sema.tupleField(block, inst_src, inst, field_src, field_i);	31376	const elem_ref = try sema.tupleField(block, inst_src, inst, field_src, field_i);
31377	const coerced = try sema.coerce(block, field_ty, elem_ref, field_src);	31377	const coerced = try sema.coerce(block, field_ty, elem_ref, field_src);
31378	field_refs[field_index] = coerced;	31378	field_refs[field_index] = coerced;
...	@@ -31383,7 +31383,7 @@ fn coerceTupleToStruct(	...	@@ -31383,7 +31383,7 @@ fn coerceTupleToStruct(
31383	});	31383	});
31384	};	31384	};
31385		31385
31386	const field_init = struct_type.field_inits.get(ip)[field_index].toValue();	31386	const field_init = Value.fromInterned(struct_type.field_inits.get(ip)[field_index]);
31387	if (!init_val.eql(field_init, field_ty, sema.mod)) {	31387	if (!init_val.eql(field_init, field_ty, sema.mod)) {
31388	return sema.failWithInvalidComptimeFieldStore(block, field_src, inst_ty, field_i);	31388	return sema.failWithInvalidComptimeFieldStore(block, field_src, inst_ty, field_i);
31389	}	31389	}
...	@@ -31502,7 +31502,7 @@ fn coerceTupleToTuple(	...	@@ -31502,7 +31502,7 @@ fn coerceTupleToTuple(
31502	const field_index = try sema.tupleFieldIndex(block, tuple_ty, field_name, field_src);	31502	const field_index = try sema.tupleFieldIndex(block, tuple_ty, field_name, field_src);
31503		31503
31504	const elem_ref = try sema.tupleField(block, inst_src, inst, field_src, field_i);	31504	const elem_ref = try sema.tupleField(block, inst_src, inst, field_src, field_i);
31505	const coerced = try sema.coerce(block, field_ty.toType(), elem_ref, field_src);	31505	const coerced = try sema.coerce(block, Type.fromInterned(field_ty), elem_ref, field_src);
31506	field_refs[field_index] = coerced;	31506	field_refs[field_index] = coerced;
31507	if (default_val != .none) {	31507	if (default_val != .none) {
31508	const init_val = (try sema.resolveValue(coerced)) orelse {	31508	const init_val = (try sema.resolveValue(coerced)) orelse {
...	@@ -31511,7 +31511,7 @@ fn coerceTupleToTuple(	...	@@ -31511,7 +31511,7 @@ fn coerceTupleToTuple(
31511	});	31511	});
31512	};	31512	};
31513		31513
31514	if (!init_val.eql(default_val.toValue(), field_ty.toType(), sema.mod)) {	31514	if (!init_val.eql(Value.fromInterned(default_val), Type.fromInterned(field_ty), sema.mod)) {
31515	return sema.failWithInvalidComptimeFieldStore(block, field_src, inst_ty, field_i);	31515	return sema.failWithInvalidComptimeFieldStore(block, field_src, inst_ty, field_i);
31516	}	31516	}
31517	}	31517	}
...	@@ -31658,13 +31658,13 @@ fn ensureFuncBodyAnalyzed(sema: *Sema, func: InternPool.Index) CompileError!void	...	@@ -31658,13 +31658,13 @@ fn ensureFuncBodyAnalyzed(sema: *Sema, func: InternPool.Index) CompileError!void
31658	fn optRefValue(sema: *Sema, opt_val: ?Value) !Value {	31658	fn optRefValue(sema: *Sema, opt_val: ?Value) !Value {
31659	const mod = sema.mod;	31659	const mod = sema.mod;
31660	const ptr_anyopaque_ty = try mod.singleConstPtrType(Type.anyopaque);	31660	const ptr_anyopaque_ty = try mod.singleConstPtrType(Type.anyopaque);
31661	return (try mod.intern(.{ .opt = .{	31661	return Value.fromInterned((try mod.intern(.{ .opt = .{
31662	.ty = (try mod.optionalType(ptr_anyopaque_ty.toIntern())).toIntern(),	31662	.ty = (try mod.optionalType(ptr_anyopaque_ty.toIntern())).toIntern(),
31663	.val = if (opt_val) \|val\| (try mod.getCoerced(	31663	.val = if (opt_val) \|val\| (try mod.getCoerced(
31664	(try sema.refValue(val.toIntern())).toValue(),	31664	Value.fromInterned((try sema.refValue(val.toIntern()))),
31665	ptr_anyopaque_ty,	31665	ptr_anyopaque_ty,
31666	)).toIntern() else .none,	31666	)).toIntern() else .none,
31667	} })).toValue();	31667	} })));
31668	}	31668	}
31669		31669
31670	fn analyzeDeclRef(sema: *Sema, decl_index: Decl.Index) CompileError!Air.Inst.Ref {	31670	fn analyzeDeclRef(sema: *Sema, decl_index: Decl.Index) CompileError!Air.Inst.Ref {
...	@@ -32378,7 +32378,7 @@ fn analyzeSlice(	...	@@ -32378,7 +32378,7 @@ fn analyzeSlice(
32378		32378
32379	if (!new_ptr_val.isUndef(mod)) {	32379	if (!new_ptr_val.isUndef(mod)) {
32380	return Air.internedToRef((try mod.getCoerced(	32380	return Air.internedToRef((try mod.getCoerced(
32381	(try new_ptr_val.intern(new_ptr_ty, mod)).toValue(),	32381	Value.fromInterned((try new_ptr_val.intern(new_ptr_ty, mod))),
32382	return_ty,	32382	return_ty,
32383	)).toIntern());	32383	)).toIntern());
32384	}	32384	}
...	@@ -33362,10 +33362,10 @@ fn resolvePeerTypesInner(	...	@@ -33362,10 +33362,10 @@ fn resolvePeerTypesInner(
33362	ty_ptr.* = ty.errorUnionPayload(mod);	33362	ty_ptr.* = ty.errorUnionPayload(mod);
33363	if (val_ptr.*) \|eu_val\| switch (ip.indexToKey(eu_val.toIntern())) {	33363	if (val_ptr.*) \|eu_val\| switch (ip.indexToKey(eu_val.toIntern())) {
33364	.error_union => \|eu\| switch (eu.val) {	33364	.error_union => \|eu\| switch (eu.val) {
33365	.payload => \|payload_ip\| val_ptr.* = payload_ip.toValue(),	33365	.payload => \|payload_ip\| val_ptr.* = Value.fromInterned(payload_ip),
33366	.err_name => val_ptr.* = null,	33366	.err_name => val_ptr.* = null,
33367	},	33367	},
33368	.undef => val_ptr.* = (try sema.mod.intern(.{ .undef = ty_ptr.*.?.toIntern() })).toValue(),	33368	.undef => val_ptr.* = Value.fromInterned((try sema.mod.intern(.{ .undef = ty_ptr.*.?.toIntern() }))),
33369	else => unreachable,	33369	else => unreachable,
33370	};	33370	};
33371	break :blk set_ty;	33371	break :blk set_ty;
...	@@ -33606,7 +33606,7 @@ fn resolvePeerTypesInner(	...	@@ -33606,7 +33606,7 @@ fn resolvePeerTypesInner(
33606	};	33606	};
33607		33607
33608	// Try peer -> cur, then cur -> peer	33608	// Try peer -> cur, then cur -> peer
33609	ptr_info.child = ((try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), peer_info.child.toType())) orelse {	33609	ptr_info.child = ((try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), Type.fromInterned(peer_info.child))) orelse {
33610	return .{ .conflict = .{	33610	return .{ .conflict = .{
33611	.peer_idx_a = first_idx,	33611	.peer_idx_a = first_idx,
33612	.peer_idx_b = i,	33612	.peer_idx_b = i,
...	@@ -33630,12 +33630,12 @@ fn resolvePeerTypesInner(	...	@@ -33630,12 +33630,12 @@ fn resolvePeerTypesInner(
33630	if (ptr_info.flags.alignment != .none)	33630	if (ptr_info.flags.alignment != .none)
33631	ptr_info.flags.alignment	33631	ptr_info.flags.alignment
33632	else	33632	else
33633	ptr_info.child.toType().abiAlignment(mod),	33633	Type.fromInterned(ptr_info.child).abiAlignment(mod),
33634		33634
33635	if (peer_info.flags.alignment != .none)	33635	if (peer_info.flags.alignment != .none)
33636	peer_info.flags.alignment	33636	peer_info.flags.alignment
33637	else	33637	else
33638	peer_info.child.toType().abiAlignment(mod),	33638	Type.fromInterned(peer_info.child).abiAlignment(mod),
33639	);	33639	);
33640	if (ptr_info.flags.address_space != peer_info.flags.address_space) {	33640	if (ptr_info.flags.address_space != peer_info.flags.address_space) {
33641	return .{ .conflict = .{	33641	return .{ .conflict = .{
...	@@ -33714,12 +33714,12 @@ fn resolvePeerTypesInner(	...	@@ -33714,12 +33714,12 @@ fn resolvePeerTypesInner(
33714	if (ptr_info.flags.alignment != .none)	33714	if (ptr_info.flags.alignment != .none)
33715	ptr_info.flags.alignment	33715	ptr_info.flags.alignment
33716	else	33716	else
33717	try sema.typeAbiAlignment(ptr_info.child.toType()),	33717	try sema.typeAbiAlignment(Type.fromInterned(ptr_info.child)),
33718		33718
33719	if (peer_info.flags.alignment != .none)	33719	if (peer_info.flags.alignment != .none)
33720	peer_info.flags.alignment	33720	peer_info.flags.alignment
33721	else	33721	else
33722	try sema.typeAbiAlignment(peer_info.child.toType()),	33722	try sema.typeAbiAlignment(Type.fromInterned(peer_info.child)),
33723	);	33723	);
33724		33724
33725	if (ptr_info.flags.address_space != peer_info.flags.address_space) {	33725	if (ptr_info.flags.address_space != peer_info.flags.address_space) {
...	@@ -33754,8 +33754,8 @@ fn resolvePeerTypesInner(	...	@@ -33754,8 +33754,8 @@ fn resolvePeerTypesInner(
33754	};	33754	};
33755		33755
33756	// We abstract array handling slightly so that tuple pointers can work like array pointers	33756	// We abstract array handling slightly so that tuple pointers can work like array pointers
33757	const peer_pointee_array = sema.typeIsArrayLike(peer_info.child.toType());	33757	const peer_pointee_array = sema.typeIsArrayLike(Type.fromInterned(peer_info.child));
33758	const cur_pointee_array = sema.typeIsArrayLike(ptr_info.child.toType());	33758	const cur_pointee_array = sema.typeIsArrayLike(Type.fromInterned(ptr_info.child));
33759		33759
33760	// This switch is just responsible for deciding the size and pointee (not including	33760	// This switch is just responsible for deciding the size and pointee (not including
33761	// single-pointer array sentinel).	33761	// single-pointer array sentinel).
...	@@ -33763,7 +33763,7 @@ fn resolvePeerTypesInner(	...	@@ -33763,7 +33763,7 @@ fn resolvePeerTypesInner(
33763	switch (peer_info.flags.size) {	33763	switch (peer_info.flags.size) {
33764	.One => switch (ptr_info.flags.size) {	33764	.One => switch (ptr_info.flags.size) {
33765	.One => {	33765	.One => {
33766	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), peer_info.child.toType())) \|pointee\| {	33766	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), Type.fromInterned(peer_info.child))) \|pointee\| {
33767	ptr_info.child = pointee.toIntern();	33767	ptr_info.child = pointee.toIntern();
33768	break :good;	33768	break :good;
33769	}	33769	}
...	@@ -33805,7 +33805,7 @@ fn resolvePeerTypesInner(	...	@@ -33805,7 +33805,7 @@ fn resolvePeerTypesInner(
33805	.Many => {	33805	.Many => {
33806	// Only works for [n]T + []T -> [*]T	33806	// Only works for [n]T + []T -> [*]T
33807	const arr = peer_pointee_array orelse return generic_err;	33807	const arr = peer_pointee_array orelse return generic_err;
33808	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), arr.elem_ty)) \|pointee\| {	33808	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), arr.elem_ty)) \|pointee\| {
33809	ptr_info.child = pointee.toIntern();	33809	ptr_info.child = pointee.toIntern();
33810	break :good;	33810	break :good;
33811	}	33811	}
...	@@ -33818,7 +33818,7 @@ fn resolvePeerTypesInner(	...	@@ -33818,7 +33818,7 @@ fn resolvePeerTypesInner(
33818	.Slice => {	33818	.Slice => {
33819	// Only works for *[n]T + []T -> []T	33819	// Only works for *[n]T + []T -> []T
33820	const arr = peer_pointee_array orelse return generic_err;	33820	const arr = peer_pointee_array orelse return generic_err;
33821	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), arr.elem_ty)) \|pointee\| {	33821	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), arr.elem_ty)) \|pointee\| {
33822	ptr_info.child = pointee.toIntern();	33822	ptr_info.child = pointee.toIntern();
33823	break :good;	33823	break :good;
33824	}	33824	}
...	@@ -33834,7 +33834,7 @@ fn resolvePeerTypesInner(	...	@@ -33834,7 +33834,7 @@ fn resolvePeerTypesInner(
33834	.One => {	33834	.One => {
33835	// Only works for []T + [n]T -> [*]T	33835	// Only works for []T + [n]T -> [*]T
33836	const arr = cur_pointee_array orelse return generic_err;	33836	const arr = cur_pointee_array orelse return generic_err;
33837	if (try sema.resolvePairInMemoryCoercible(block, src, arr.elem_ty, peer_info.child.toType())) \|pointee\| {	33837	if (try sema.resolvePairInMemoryCoercible(block, src, arr.elem_ty, Type.fromInterned(peer_info.child))) \|pointee\| {
33838	ptr_info.flags.size = .Many;	33838	ptr_info.flags.size = .Many;
33839	ptr_info.child = pointee.toIntern();	33839	ptr_info.child = pointee.toIntern();
33840	break :good;	33840	break :good;
...	@@ -33848,7 +33848,7 @@ fn resolvePeerTypesInner(	...	@@ -33848,7 +33848,7 @@ fn resolvePeerTypesInner(
33848	return generic_err;	33848	return generic_err;
33849	},	33849	},
33850	.Many => {	33850	.Many => {
33851	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), peer_info.child.toType())) \|pointee\| {	33851	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), Type.fromInterned(peer_info.child))) \|pointee\| {
33852	ptr_info.child = pointee.toIntern();	33852	ptr_info.child = pointee.toIntern();
33853	break :good;	33853	break :good;
33854	}	33854	}
...	@@ -33863,7 +33863,7 @@ fn resolvePeerTypesInner(	...	@@ -33863,7 +33863,7 @@ fn resolvePeerTypesInner(
33863	} };	33863	} };
33864	}	33864	}
33865	// Okay, then works for []T + "[]T" -> []T	33865	// Okay, then works for []T + "[]T" -> []T
33866	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), peer_info.child.toType())) \|pointee\| {	33866	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), Type.fromInterned(peer_info.child))) \|pointee\| {
33867	ptr_info.flags.size = .Many;	33867	ptr_info.flags.size = .Many;
33868	ptr_info.child = pointee.toIntern();	33868	ptr_info.child = pointee.toIntern();
33869	break :good;	33869	break :good;
...	@@ -33876,7 +33876,7 @@ fn resolvePeerTypesInner(	...	@@ -33876,7 +33876,7 @@ fn resolvePeerTypesInner(
33876	.One => {	33876	.One => {
33877	// Only works for []T + *[n]T -> []T	33877	// Only works for []T + *[n]T -> []T
33878	const arr = cur_pointee_array orelse return generic_err;	33878	const arr = cur_pointee_array orelse return generic_err;
33879	if (try sema.resolvePairInMemoryCoercible(block, src, arr.elem_ty, peer_info.child.toType())) \|pointee\| {	33879	if (try sema.resolvePairInMemoryCoercible(block, src, arr.elem_ty, Type.fromInterned(peer_info.child))) \|pointee\| {
33880	ptr_info.flags.size = .Slice;	33880	ptr_info.flags.size = .Slice;
33881	ptr_info.child = pointee.toIntern();	33881	ptr_info.child = pointee.toIntern();
33882	break :good;	33882	break :good;
...	@@ -33894,7 +33894,7 @@ fn resolvePeerTypesInner(	...	@@ -33894,7 +33894,7 @@ fn resolvePeerTypesInner(
33894	return generic_err;	33894	return generic_err;
33895	},	33895	},
33896	.Slice => {	33896	.Slice => {
33897	if (try sema.resolvePairInMemoryCoercible(block, src, ptr_info.child.toType(), peer_info.child.toType())) \|pointee\| {	33897	if (try sema.resolvePairInMemoryCoercible(block, src, Type.fromInterned(ptr_info.child), Type.fromInterned(peer_info.child))) \|pointee\| {
33898	ptr_info.child = pointee.toIntern();	33898	ptr_info.child = pointee.toIntern();
33899	break :good;	33899	break :good;
33900	}	33900	}
...	@@ -34331,7 +34331,7 @@ fn resolvePeerTypesInner(	...	@@ -34331,7 +34331,7 @@ fn resolvePeerTypesInner(
34331	break;	34331	break;
34332	};	34332	};
34333	const uncoerced_field = Air.internedToRef(uncoerced_field_val.toIntern());	34333	const uncoerced_field = Air.internedToRef(uncoerced_field_val.toIntern());
34334	const coerced_inst = sema.coerceExtra(block, field_ty.toType(), uncoerced_field, src, .{ .report_err = false }) catch \|err\| switch (err) {	34334	const coerced_inst = sema.coerceExtra(block, Type.fromInterned(field_ty.*), uncoerced_field, src, .{ .report_err = false }) catch \|err\| switch (err) {
34335	// It's possible for PTR to give false positives. Just give up on making this a comptime field, we'll get an error later anyway	34335	// It's possible for PTR to give false positives. Just give up on making this a comptime field, we'll get an error later anyway
34336	error.NotCoercible => {	34336	error.NotCoercible => {
34337	comptime_val = null;	34337	comptime_val = null;
...	@@ -34344,7 +34344,7 @@ fn resolvePeerTypesInner(	...	@@ -34344,7 +34344,7 @@ fn resolvePeerTypesInner(
34344	comptime_val = coerced_val;	34344	comptime_val = coerced_val;
34345	continue;	34345	continue;
34346	};	34346	};
34347	if (!coerced_val.eql(existing, field_ty.toType(), mod)) {	34347	if (!coerced_val.eql(existing, Type.fromInterned(field_ty.*), mod)) {
34348	comptime_val = null;	34348	comptime_val = null;
34349	break;	34349	break;
34350	}	34350	}
...	@@ -34359,7 +34359,7 @@ fn resolvePeerTypesInner(	...	@@ -34359,7 +34359,7 @@ fn resolvePeerTypesInner(
34359	.values = field_vals,	34359	.values = field_vals,
34360	});	34360	});
34361		34361
34362	return .{ .success = final_ty.toType() };	34362	return .{ .success = Type.fromInterned(final_ty) };
34363	},	34363	},
34364		34364
34365	.exact => {	34365	.exact => {
...	@@ -34460,15 +34460,15 @@ pub fn resolveFnTypes(sema: *Sema, fn_ty: Type) CompileError!void {	...	@@ -34460,15 +34460,15 @@ pub fn resolveFnTypes(sema: *Sema, fn_ty: Type) CompileError!void {
34460	const ip = &mod.intern_pool;	34460	const ip = &mod.intern_pool;
34461	const fn_ty_info = mod.typeToFunc(fn_ty).?;	34461	const fn_ty_info = mod.typeToFunc(fn_ty).?;
34462		34462
34463	try sema.resolveTypeFully(fn_ty_info.return_type.toType());	34463	try sema.resolveTypeFully(Type.fromInterned(fn_ty_info.return_type));
34464		34464
34465	if (mod.comp.bin_file.options.error_return_tracing and fn_ty_info.return_type.toType().isError(mod)) {	34465	if (mod.comp.bin_file.options.error_return_tracing and Type.fromInterned(fn_ty_info.return_type).isError(mod)) {
34466	// Ensure the type exists so that backends can assume that.	34466	// Ensure the type exists so that backends can assume that.
34467	_ = try sema.getBuiltinType("StackTrace");	34467	_ = try sema.getBuiltinType("StackTrace");
34468	}	34468	}
34469		34469
34470	for (0..fn_ty_info.param_types.len) \|i\| {	34470	for (0..fn_ty_info.param_types.len) \|i\| {
34471	try sema.resolveTypeFully(fn_ty_info.param_types.get(ip)[i].toType());	34471	try sema.resolveTypeFully(Type.fromInterned(fn_ty_info.param_types.get(ip)[i]));
34472	}	34472	}
34473	}	34473	}
34474		34474
...	@@ -34480,20 +34480,20 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {	...	@@ -34480,20 +34480,20 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {
34480	.int => \|int\| switch (int.storage) {	34480	.int => \|int\| switch (int.storage) {
34481	.u64, .i64, .big_int => return val,	34481	.u64, .i64, .big_int => return val,
34482	.lazy_align, .lazy_size => return mod.intValue(	34482	.lazy_align, .lazy_size => return mod.intValue(
34483	int.ty.toType(),	34483	Type.fromInterned(int.ty),
34484	(try val.getUnsignedIntAdvanced(mod, sema)).?,	34484	(try val.getUnsignedIntAdvanced(mod, sema)).?,
34485	),	34485	),
34486	},	34486	},
34487	.ptr => \|ptr\| {	34487	.ptr => \|ptr\| {
34488	const resolved_len = switch (ptr.len) {	34488	const resolved_len = switch (ptr.len) {
34489	.none => .none,	34489	.none => .none,
34490	else => (try sema.resolveLazyValue(ptr.len.toValue())).toIntern(),	34490	else => (try sema.resolveLazyValue(Value.fromInterned(ptr.len))).toIntern(),
34491	};	34491	};
34492	switch (ptr.addr) {	34492	switch (ptr.addr) {
34493	.decl, .mut_decl, .anon_decl => return if (resolved_len == ptr.len)	34493	.decl, .mut_decl, .anon_decl => return if (resolved_len == ptr.len)
34494	val	34494	val
34495	else	34495	else
34496	(try mod.intern(.{ .ptr = .{	34496	Value.fromInterned((try mod.intern(.{ .ptr = .{
34497	.ty = ptr.ty,	34497	.ty = ptr.ty,
34498	.addr = switch (ptr.addr) {	34498	.addr = switch (ptr.addr) {
34499	.decl => \|decl\| .{ .decl = decl },	34499	.decl => \|decl\| .{ .decl = decl },
...	@@ -34502,36 +34502,36 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {	...	@@ -34502,36 +34502,36 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {
34502	else => unreachable,	34502	else => unreachable,
34503	},	34503	},
34504	.len = resolved_len,	34504	.len = resolved_len,
34505	} })).toValue(),	34505	} }))),
34506	.comptime_field => \|field_val\| {	34506	.comptime_field => \|field_val\| {
34507	const resolved_field_val =	34507	const resolved_field_val =
34508	(try sema.resolveLazyValue(field_val.toValue())).toIntern();	34508	(try sema.resolveLazyValue(Value.fromInterned(field_val))).toIntern();
34509	return if (resolved_field_val == field_val and resolved_len == ptr.len)	34509	return if (resolved_field_val == field_val and resolved_len == ptr.len)
34510	val	34510	val
34511	else	34511	else
34512	(try mod.intern(.{ .ptr = .{	34512	Value.fromInterned((try mod.intern(.{ .ptr = .{
34513	.ty = ptr.ty,	34513	.ty = ptr.ty,
34514	.addr = .{ .comptime_field = resolved_field_val },	34514	.addr = .{ .comptime_field = resolved_field_val },
34515	.len = resolved_len,	34515	.len = resolved_len,
34516	} })).toValue();	34516	} })));
34517	},	34517	},
34518	.int => \|int\| {	34518	.int => \|int\| {
34519	const resolved_int = (try sema.resolveLazyValue(int.toValue())).toIntern();	34519	const resolved_int = (try sema.resolveLazyValue(Value.fromInterned(int))).toIntern();
34520	return if (resolved_int == int and resolved_len == ptr.len)	34520	return if (resolved_int == int and resolved_len == ptr.len)
34521	val	34521	val
34522	else	34522	else
34523	(try mod.intern(.{ .ptr = .{	34523	Value.fromInterned((try mod.intern(.{ .ptr = .{
34524	.ty = ptr.ty,	34524	.ty = ptr.ty,
34525	.addr = .{ .int = resolved_int },	34525	.addr = .{ .int = resolved_int },
34526	.len = resolved_len,	34526	.len = resolved_len,
34527	} })).toValue();	34527	} })));
34528	},	34528	},
34529	.eu_payload, .opt_payload => \|base\| {	34529	.eu_payload, .opt_payload => \|base\| {
34530	const resolved_base = (try sema.resolveLazyValue(base.toValue())).toIntern();	34530	const resolved_base = (try sema.resolveLazyValue(Value.fromInterned(base))).toIntern();
34531	return if (resolved_base == base and resolved_len == ptr.len)	34531	return if (resolved_base == base and resolved_len == ptr.len)
34532	val	34532	val
34533	else	34533	else
34534	(try mod.intern(.{ .ptr = .{	34534	Value.fromInterned((try mod.intern(.{ .ptr = .{
34535	.ty = ptr.ty,	34535	.ty = ptr.ty,
34536	.addr = switch (ptr.addr) {	34536	.addr = switch (ptr.addr) {
34537	.eu_payload => .{ .eu_payload = resolved_base },	34537	.eu_payload => .{ .eu_payload = resolved_base },
...	@@ -34539,14 +34539,14 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {	...	@@ -34539,14 +34539,14 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {
34539	else => unreachable,	34539	else => unreachable,
34540	},	34540	},
34541	.len = ptr.len,	34541	.len = ptr.len,
34542	} })).toValue();	34542	} })));
34543	},	34543	},
34544	.elem, .field => \|base_index\| {	34544	.elem, .field => \|base_index\| {
34545	const resolved_base = (try sema.resolveLazyValue(base_index.base.toValue())).toIntern();	34545	const resolved_base = (try sema.resolveLazyValue(Value.fromInterned(base_index.base))).toIntern();
34546	return if (resolved_base == base_index.base and resolved_len == ptr.len)	34546	return if (resolved_base == base_index.base and resolved_len == ptr.len)
34547	val	34547	val
34548	else	34548	else
34549	(try mod.intern(.{ .ptr = .{	34549	Value.fromInterned((try mod.intern(.{ .ptr = .{
34550	.ty = ptr.ty,	34550	.ty = ptr.ty,
34551	.addr = switch (ptr.addr) {	34551	.addr = switch (ptr.addr) {
34552	.elem => .{ .elem = .{	34552	.elem => .{ .elem = .{
...	@@ -34560,7 +34560,7 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {	...	@@ -34560,7 +34560,7 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {
34560	else => unreachable,	34560	else => unreachable,
34561	},	34561	},
34562	.len = ptr.len,	34562	.len = ptr.len,
34563	} })).toValue();	34563	} })));
34564	},	34564	},
34565	}	34565	}
34566	},	34566	},
...	@@ -34569,37 +34569,37 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {	...	@@ -34569,37 +34569,37 @@ fn resolveLazyValue(sema: *Sema, val: Value) CompileError!Value {
34569	.elems => \|elems\| {	34569	.elems => \|elems\| {
34570	var resolved_elems: []InternPool.Index = &.{};	34570	var resolved_elems: []InternPool.Index = &.{};
34571	for (elems, 0..) \|elem, i\| {	34571	for (elems, 0..) \|elem, i\| {
34572	const resolved_elem = (try sema.resolveLazyValue(elem.toValue())).toIntern();	34572	const resolved_elem = (try sema.resolveLazyValue(Value.fromInterned(elem))).toIntern();
34573	if (resolved_elems.len == 0 and resolved_elem != elem) {	34573	if (resolved_elems.len == 0 and resolved_elem != elem) {
34574	resolved_elems = try sema.arena.alloc(InternPool.Index, elems.len);	34574	resolved_elems = try sema.arena.alloc(InternPool.Index, elems.len);
34575	@memcpy(resolved_elems[0..i], elems[0..i]);	34575	@memcpy(resolved_elems[0..i], elems[0..i]);
34576	}	34576	}
34577	if (resolved_elems.len > 0) resolved_elems[i] = resolved_elem;	34577	if (resolved_elems.len > 0) resolved_elems[i] = resolved_elem;
34578	}	34578	}
34579	return if (resolved_elems.len == 0) val else (try mod.intern(.{ .aggregate = .{	34579	return if (resolved_elems.len == 0) val else Value.fromInterned((try mod.intern(.{ .aggregate = .{
34580	.ty = aggregate.ty,	34580	.ty = aggregate.ty,
34581	.storage = .{ .elems = resolved_elems },	34581	.storage = .{ .elems = resolved_elems },
34582	} })).toValue();	34582	} })));
34583	},	34583	},
34584	.repeated_elem => \|elem\| {	34584	.repeated_elem => \|elem\| {
34585	const resolved_elem = (try sema.resolveLazyValue(elem.toValue())).toIntern();	34585	const resolved_elem = (try sema.resolveLazyValue(Value.fromInterned(elem))).toIntern();
34586	return if (resolved_elem == elem) val else (try mod.intern(.{ .aggregate = .{	34586	return if (resolved_elem == elem) val else Value.fromInterned((try mod.intern(.{ .aggregate = .{
34587	.ty = aggregate.ty,	34587	.ty = aggregate.ty,
34588	.storage = .{ .repeated_elem = resolved_elem },	34588	.storage = .{ .repeated_elem = resolved_elem },
34589	} })).toValue();	34589	} })));
34590	},	34590	},
34591	},	34591	},
34592	.un => \|un\| {	34592	.un => \|un\| {
34593	const resolved_tag = (try sema.resolveLazyValue(un.tag.toValue())).toIntern();	34593	const resolved_tag = (try sema.resolveLazyValue(Value.fromInterned(un.tag))).toIntern();
34594	const resolved_val = (try sema.resolveLazyValue(un.val.toValue())).toIntern();	34594	const resolved_val = (try sema.resolveLazyValue(Value.fromInterned(un.val))).toIntern();
34595	return if (resolved_tag == un.tag and resolved_val == un.val)	34595	return if (resolved_tag == un.tag and resolved_val == un.val)
34596	val	34596	val
34597	else	34597	else
34598	(try mod.intern(.{ .un = .{	34598	Value.fromInterned((try mod.intern(.{ .un = .{
34599	.ty = un.ty,	34599	.ty = un.ty,
34600	.tag = resolved_tag,	34600	.tag = resolved_tag,
34601	.val = resolved_val,	34601	.val = resolved_val,
34602	} })).toValue();	34602	} })));
34603	},	34603	},
34604	else => return val,	34604	else => return val,
34605	}	34605	}
...	@@ -34641,9 +34641,9 @@ pub fn resolveTypeLayout(sema: *Sema, ty: Type) CompileError!void {	...	@@ -34641,9 +34641,9 @@ pub fn resolveTypeLayout(sema: *Sema, ty: Type) CompileError!void {
34641	const ip = &mod.intern_pool;	34641	const ip = &mod.intern_pool;
34642	for (0..info.param_types.len) \|i\| {	34642	for (0..info.param_types.len) \|i\| {
34643	const param_ty = info.param_types.get(ip)[i];	34643	const param_ty = info.param_types.get(ip)[i];
34644	try sema.resolveTypeLayout(param_ty.toType());	34644	try sema.resolveTypeLayout(Type.fromInterned(param_ty));
34645	}	34645	}
34646	try sema.resolveTypeLayout(info.return_type.toType());	34646	try sema.resolveTypeLayout(Type.fromInterned(info.return_type));
34647	},	34647	},
34648	else => {},	34648	else => {},
34649	}	34649	}
...	@@ -34689,7 +34689,7 @@ pub fn resolveStructAlignment(	...	@@ -34689,7 +34689,7 @@ pub fn resolveStructAlignment(
34689	var result: Alignment = .@"1";	34689	var result: Alignment = .@"1";
34690		34690
34691	for (0..struct_type.field_types.len) \|i\| {	34691	for (0..struct_type.field_types.len) \|i\| {
34692	const field_ty = struct_type.field_types.get(ip)[i].toType();	34692	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
34693	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty))	34693	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty))
34694	continue;	34694	continue;
34695	const field_align = try sema.structFieldAlignment(	34695	const field_align = try sema.structFieldAlignment(
...	@@ -34736,7 +34736,7 @@ fn resolveStructLayout(sema: *Sema, ty: Type) CompileError!void {	...	@@ -34736,7 +34736,7 @@ fn resolveStructLayout(sema: *Sema, ty: Type) CompileError!void {
34736	var big_align: Alignment = .@"1";	34736	var big_align: Alignment = .@"1";
34737		34737
34738	for (aligns, sizes, 0..) \|field_align, field_size, i\| {	34738	for (aligns, sizes, 0..) \|field_align, field_size, i\| {
34739	const field_ty = struct_type.field_types.get(ip)[i].toType();	34739	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
34740	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty)) {	34740	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty)) {
34741	struct_type.offsets.get(ip)[i] = 0;	34741	struct_type.offsets.get(ip)[i] = 0;
34742	field_size.* = 0;	34742	field_size.* = 0;
...	@@ -34786,7 +34786,7 @@ fn resolveStructLayout(sema: *Sema, ty: Type) CompileError!void {	...	@@ -34786,7 +34786,7 @@ fn resolveStructLayout(sema: *Sema, ty: Type) CompileError!void {
34786	const runtime_order = struct_type.runtime_order.get(ip);	34786	const runtime_order = struct_type.runtime_order.get(ip);
34787		34787
34788	for (runtime_order, 0..) \|*ro, i\| {	34788	for (runtime_order, 0..) \|*ro, i\| {
34789	const field_ty = struct_type.field_types.get(ip)[i].toType();	34789	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
34790	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty)) {	34790	if (struct_type.fieldIsComptime(ip, i) or try sema.typeRequiresComptime(field_ty)) {
34791	ro.* = .omitted;	34791	ro.* = .omitted;
34792	} else {	34792	} else {
...	@@ -34892,7 +34892,7 @@ fn semaBackingIntType(mod: *Module, struct_type: InternPool.Key.StructType) Comp	...	@@ -34892,7 +34892,7 @@ fn semaBackingIntType(mod: *Module, struct_type: InternPool.Key.StructType) Comp
34892	const fields_bit_sum = blk: {	34892	const fields_bit_sum = blk: {
34893	var accumulator: u64 = 0;	34893	var accumulator: u64 = 0;
34894	for (0..struct_type.field_types.len) \|i\| {	34894	for (0..struct_type.field_types.len) \|i\| {
34895	const field_ty = struct_type.field_types.get(ip)[i].toType();	34895	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
34896	accumulator += try field_ty.bitSizeAdvanced(mod, &sema);	34896	accumulator += try field_ty.bitSizeAdvanced(mod, &sema);
34897	}	34897	}
34898	break :blk accumulator;	34898	break :blk accumulator;
...	@@ -35018,7 +35018,7 @@ pub fn resolveUnionAlignment(	...	@@ -35018,7 +35018,7 @@ pub fn resolveUnionAlignment(
35018	const union_obj = ip.loadUnionType(union_type);	35018	const union_obj = ip.loadUnionType(union_type);
35019	var max_align: Alignment = .@"1";	35019	var max_align: Alignment = .@"1";
35020	for (0..union_obj.field_names.len) \|field_index\| {	35020	for (0..union_obj.field_names.len) \|field_index\| {
35021	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	35021	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
35022	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;	35022	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;
35023		35023
35024	const explicit_align = union_obj.fieldAlign(ip, @intCast(field_index));	35024	const explicit_align = union_obj.fieldAlign(ip, @intCast(field_index));
...	@@ -35067,7 +35067,7 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35067,7 +35067,7 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {
35067	var max_size: u64 = 0;	35067	var max_size: u64 = 0;
35068	var max_align: Alignment = .@"1";	35068	var max_align: Alignment = .@"1";
35069	for (0..union_obj.field_names.len) \|field_index\| {	35069	for (0..union_obj.field_names.len) \|field_index\| {
35070	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	35070	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
35071	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;	35071	if (!(try sema.typeHasRuntimeBits(field_ty))) continue;
35072		35072
35073	max_size = @max(max_size, sema.typeAbiSize(field_ty) catch \|err\| switch (err) {	35073	max_size = @max(max_size, sema.typeAbiSize(field_ty) catch \|err\| switch (err) {
...	@@ -35089,9 +35089,9 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35089,9 +35089,9 @@ fn resolveUnionLayout(sema: *Sema, ty: Type) CompileError!void {
35089	}	35089	}
35090		35090
35091	const flags = union_obj.flagsPtr(ip);	35091	const flags = union_obj.flagsPtr(ip);
35092	const has_runtime_tag = flags.runtime_tag.hasTag() and try sema.typeHasRuntimeBits(union_obj.enum_tag_ty.toType());	35092	const has_runtime_tag = flags.runtime_tag.hasTag() and try sema.typeHasRuntimeBits(Type.fromInterned(union_obj.enum_tag_ty));
35093	const size, const alignment, const padding = if (has_runtime_tag) layout: {	35093	const size, const alignment, const padding = if (has_runtime_tag) layout: {
35094	const enum_tag_type = union_obj.enum_tag_ty.toType();	35094	const enum_tag_type = Type.fromInterned(union_obj.enum_tag_ty);
35095	const tag_align = try sema.typeAbiAlignment(enum_tag_type);	35095	const tag_align = try sema.typeAbiAlignment(enum_tag_type);
35096	const tag_size = try sema.typeAbiSize(enum_tag_type);	35096	const tag_size = try sema.typeAbiSize(enum_tag_type);
35097		35097
...	@@ -35161,7 +35161,7 @@ pub fn resolveTypeFully(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35161,7 +35161,7 @@ pub fn resolveTypeFully(sema: *Sema, ty: Type) CompileError!void {
35161	.struct_type => return sema.resolveStructFully(ty),	35161	.struct_type => return sema.resolveStructFully(ty),
35162	.anon_struct_type => \|tuple\| {	35162	.anon_struct_type => \|tuple\| {
35163	for (tuple.types.get(ip)) \|field_ty\| {	35163	for (tuple.types.get(ip)) \|field_ty\| {
35164	try sema.resolveTypeFully(field_ty.toType());	35164	try sema.resolveTypeFully(Type.fromInterned(field_ty));
35165	}	35165	}
35166	},	35166	},
35167	.simple_type => \|simple_type\| try sema.resolveSimpleType(simple_type),	35167	.simple_type => \|simple_type\| try sema.resolveSimpleType(simple_type),
...	@@ -35182,9 +35182,9 @@ pub fn resolveTypeFully(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35182,9 +35182,9 @@ pub fn resolveTypeFully(sema: *Sema, ty: Type) CompileError!void {
35182	}	35182	}
35183	for (0..info.param_types.len) \|i\| {	35183	for (0..info.param_types.len) \|i\| {
35184	const param_ty = info.param_types.get(ip)[i];	35184	const param_ty = info.param_types.get(ip)[i];
35185	try sema.resolveTypeFully(param_ty.toType());	35185	try sema.resolveTypeFully(Type.fromInterned(param_ty));
35186	}	35186	}
35187	try sema.resolveTypeFully(info.return_type.toType());	35187	try sema.resolveTypeFully(Type.fromInterned(info.return_type));
35188	},	35188	},
35189	else => {},	35189	else => {},
35190	}	35190	}
...	@@ -35205,7 +35205,7 @@ fn resolveStructFully(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35205,7 +35205,7 @@ fn resolveStructFully(sema: *Sema, ty: Type) CompileError!void {
35205	// See also similar code for unions.	35205	// See also similar code for unions.
35206		35206
35207	for (0..struct_type.field_types.len) \|i\| {	35207	for (0..struct_type.field_types.len) \|i\| {
35208	const field_ty = struct_type.field_types.get(ip)[i].toType();	35208	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
35209	try sema.resolveTypeFully(field_ty);	35209	try sema.resolveTypeFully(field_ty);
35210	}	35210	}
35211	}	35211	}
...	@@ -35230,7 +35230,7 @@ fn resolveUnionFully(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35230,7 +35230,7 @@ fn resolveUnionFully(sema: *Sema, ty: Type) CompileError!void {
35230		35230
35231	union_obj.flagsPtr(ip).status = .fully_resolved_wip;	35231	union_obj.flagsPtr(ip).status = .fully_resolved_wip;
35232	for (0..union_obj.field_types.len) \|field_index\| {	35232	for (0..union_obj.field_types.len) \|field_index\| {
35233	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	35233	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
35234	try sema.resolveTypeFully(field_ty);	35234	try sema.resolveTypeFully(field_ty);
35235	}	35235	}
35236	union_obj.flagsPtr(ip).status = .fully_resolved;	35236	union_obj.flagsPtr(ip).status = .fully_resolved;
...	@@ -35333,7 +35333,7 @@ pub fn resolveTypeFields(sema: *Sema, ty: Type) CompileError!void {	...	@@ -35333,7 +35333,7 @@ pub fn resolveTypeFields(sema: *Sema, ty: Type) CompileError!void {
35333	.type_struct_packed_inits,	35333	.type_struct_packed_inits,
35334	=> try sema.resolveTypeFieldsStruct(ty_ip, ip.indexToKey(ty_ip).struct_type),	35334	=> try sema.resolveTypeFieldsStruct(ty_ip, ip.indexToKey(ty_ip).struct_type),
35335		35335
35336	.type_union => try sema.resolveTypeFieldsUnion(ty_ip.toType(), ip.indexToKey(ty_ip).union_type),	35336	.type_union => try sema.resolveTypeFieldsUnion(Type.fromInterned(ty_ip), ip.indexToKey(ty_ip).union_type),
35337	.simple_type => try sema.resolveSimpleType(ip.indexToKey(ty_ip).simple_type),	35337	.simple_type => try sema.resolveSimpleType(ip.indexToKey(ty_ip).simple_type),
35338	else => {},	35338	else => {},
35339	},	35339	},
...	@@ -35392,7 +35392,7 @@ pub fn resolveTypeFieldsStruct(	...	@@ -35392,7 +35392,7 @@ pub fn resolveTypeFieldsStruct(
35392	sema.gpa,	35392	sema.gpa,
35393	mod.declPtr(owner_decl).srcLoc(mod),	35393	mod.declPtr(owner_decl).srcLoc(mod),
35394	"struct '{}' depends on itself",	35394	"struct '{}' depends on itself",
35395	.{ty.toType().fmt(mod)},	35395	.{Type.fromInterned(ty).fmt(mod)},
35396	);	35396	);
35397	return sema.failWithOwnedErrorMsg(null, msg);	35397	return sema.failWithOwnedErrorMsg(null, msg);
35398	}	35398	}
...	@@ -36042,7 +36042,7 @@ fn semaStructFieldInits(	...	@@ -36042,7 +36042,7 @@ fn semaStructFieldInits(
36042	// In init bodies, the zir index of the struct itself is used	36042	// In init bodies, the zir index of the struct itself is used
36043	// to refer to the current field type.	36043	// to refer to the current field type.
36044		36044
36045	const field_ty = struct_type.field_types.get(ip)[field_i].toType();	36045	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_i]);
36046	const type_ref = Air.internedToRef(field_ty.toIntern());	36046	const type_ref = Air.internedToRef(field_ty.toIntern());
36047	try sema.inst_map.ensureSpaceForInstructions(sema.gpa, &.{zir_index});	36047	try sema.inst_map.ensureSpaceForInstructions(sema.gpa, &.{zir_index});
36048	sema.inst_map.putAssumeCapacity(zir_index, type_ref);	36048	sema.inst_map.putAssumeCapacity(zir_index, type_ref);
...	@@ -36368,10 +36368,10 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un	...	@@ -36368,10 +36368,10 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
36368	.range = .type,	36368	.range = .type,
36369	}).lazy;	36369	}).lazy;
36370	const msg = try sema.errMsg(&block_scope, ty_src, "no field named '{}' in enum '{}'", .{	36370	const msg = try sema.errMsg(&block_scope, ty_src, "no field named '{}' in enum '{}'", .{
36371	field_name.fmt(ip), union_type.tagTypePtr(ip).toType().fmt(mod),	36371	field_name.fmt(ip), Type.fromInterned(union_type.tagTypePtr(ip).*).fmt(mod),
36372	});	36372	});
36373	errdefer msg.destroy(sema.gpa);	36373	errdefer msg.destroy(sema.gpa);
36374	try sema.addDeclaredHereNote(msg, union_type.tagTypePtr(ip).toType());	36374	try sema.addDeclaredHereNote(msg, Type.fromInterned(union_type.tagTypePtr(ip).*));
36375	break :msg msg;	36375	break :msg msg;
36376	};	36376	};
36377	return sema.failWithOwnedErrorMsg(&block_scope, msg);	36377	return sema.failWithOwnedErrorMsg(&block_scope, msg);
...	@@ -36483,11 +36483,11 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un	...	@@ -36483,11 +36483,11 @@ fn semaUnionFields(mod: *Module, arena: Allocator, union_type: InternPool.Key.Un
36483		36483
36484	for (tag_info.names.get(ip), 0..) \|field_name, field_index\| {	36484	for (tag_info.names.get(ip), 0..) \|field_name, field_index\| {
36485	if (explicit_tags_seen[field_index]) continue;	36485	if (explicit_tags_seen[field_index]) continue;
36486	try sema.addFieldErrNote(union_type.tagTypePtr(ip).toType(), field_index, msg, "field '{}' missing, declared here", .{	36486	try sema.addFieldErrNote(Type.fromInterned(union_type.tagTypePtr(ip).*), field_index, msg, "field '{}' missing, declared here", .{
36487	field_name.fmt(ip),	36487	field_name.fmt(ip),
36488	});	36488	});
36489	}	36489	}
36490	try sema.addDeclaredHereNote(msg, union_type.tagTypePtr(ip).toType());	36490	try sema.addDeclaredHereNote(msg, Type.fromInterned(union_type.tagTypePtr(ip).*));
36491	break :msg msg;	36491	break :msg msg;
36492	};	36492	};
36493	return sema.failWithOwnedErrorMsg(&block_scope, msg);	36493	return sema.failWithOwnedErrorMsg(&block_scope, msg);
...	@@ -36548,7 +36548,7 @@ fn generateUnionTagTypeNumbered(	...	@@ -36548,7 +36548,7 @@ fn generateUnionTagTypeNumbered(
36548	});	36548	});
36549		36549
36550	new_decl.ty = Type.type;	36550	new_decl.ty = Type.type;
36551	new_decl.val = enum_ty.toValue();	36551	new_decl.val = Value.fromInterned(enum_ty);
36552		36552
36553	try mod.finalizeAnonDecl(new_decl_index);	36553	try mod.finalizeAnonDecl(new_decl_index);
36554	return enum_ty;	36554	return enum_ty;
...	@@ -36600,7 +36600,7 @@ fn generateUnionTagTypeSimple(	...	@@ -36600,7 +36600,7 @@ fn generateUnionTagTypeSimple(
36600	const new_decl = mod.declPtr(new_decl_index);	36600	const new_decl = mod.declPtr(new_decl_index);
36601	new_decl.owns_tv = true;	36601	new_decl.owns_tv = true;
36602	new_decl.ty = Type.type;	36602	new_decl.ty = Type.type;
36603	new_decl.val = enum_ty.toValue();	36603	new_decl.val = Value.fromInterned(enum_ty);
36604		36604
36605	try mod.finalizeAnonDecl(new_decl_index);	36605	try mod.finalizeAnonDecl(new_decl_index);
36606	return enum_ty;	36606	return enum_ty;
...	@@ -36869,16 +36869,16 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36869,16 +36869,16 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36869	=> switch (ip.indexToKey(ty.toIntern())) {	36869	=> switch (ip.indexToKey(ty.toIntern())) {
36870	inline .array_type, .vector_type => \|seq_type, seq_tag\| {	36870	inline .array_type, .vector_type => \|seq_type, seq_tag\| {
36871	const has_sentinel = seq_tag == .array_type and seq_type.sentinel != .none;	36871	const has_sentinel = seq_tag == .array_type and seq_type.sentinel != .none;
36872	if (seq_type.len + @intFromBool(has_sentinel) == 0) return (try mod.intern(.{ .aggregate = .{	36872	if (seq_type.len + @intFromBool(has_sentinel) == 0) return Value.fromInterned((try mod.intern(.{ .aggregate = .{
36873	.ty = ty.toIntern(),	36873	.ty = ty.toIntern(),
36874	.storage = .{ .elems = &.{} },	36874	.storage = .{ .elems = &.{} },
36875	} })).toValue();	36875	} })));
36876		36876
36877	if (try sema.typeHasOnePossibleValue(seq_type.child.toType())) \|opv\| {	36877	if (try sema.typeHasOnePossibleValue(Type.fromInterned(seq_type.child))) \|opv\| {
36878	return (try mod.intern(.{ .aggregate = .{	36878	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
36879	.ty = ty.toIntern(),	36879	.ty = ty.toIntern(),
36880	.storage = .{ .repeated_elem = opv.toIntern() },	36880	.storage = .{ .repeated_elem = opv.toIntern() },
36881	} })).toValue();	36881	} })));
36882	}	36882	}
36883	return null;	36883	return null;
36884	},	36884	},
...	@@ -36889,10 +36889,10 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36889,10 +36889,10 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36889	if (struct_type.field_types.len == 0) {	36889	if (struct_type.field_types.len == 0) {
36890	// In this case the struct has no fields at all and	36890	// In this case the struct has no fields at all and
36891	// therefore has one possible value.	36891	// therefore has one possible value.
36892	return (try mod.intern(.{ .aggregate = .{	36892	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
36893	.ty = ty.toIntern(),	36893	.ty = ty.toIntern(),
36894	.storage = .{ .elems = &.{} },	36894	.storage = .{ .elems = &.{} },
36895	} })).toValue();	36895	} })));
36896	}	36896	}
36897		36897
36898	const field_vals = try sema.arena.alloc(	36898	const field_vals = try sema.arena.alloc(
...	@@ -36905,7 +36905,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36905,7 +36905,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36905	field_val.* = struct_type.field_inits.get(ip)[i];	36905	field_val.* = struct_type.field_inits.get(ip)[i];
36906	continue;	36906	continue;
36907	}	36907	}
36908	const field_ty = struct_type.field_types.get(ip)[i].toType();	36908	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
36909	if (field_ty.eql(ty, mod)) {	36909	if (field_ty.eql(ty, mod)) {
36910	const msg = try Module.ErrorMsg.create(	36910	const msg = try Module.ErrorMsg.create(
36911	sema.gpa,	36911	sema.gpa,
...	@@ -36923,10 +36923,10 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36923,10 +36923,10 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36923		36923
36924	// In this case the struct has no runtime-known fields and	36924	// In this case the struct has no runtime-known fields and
36925	// therefore has one possible value.	36925	// therefore has one possible value.
36926	return (try mod.intern(.{ .aggregate = .{	36926	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
36927	.ty = ty.toIntern(),	36927	.ty = ty.toIntern(),
36928	.storage = .{ .elems = field_vals },	36928	.storage = .{ .elems = field_vals },
36929	} })).toValue();	36929	} })));
36930	},	36930	},
36931		36931
36932	.anon_struct_type => \|tuple\| {	36932	.anon_struct_type => \|tuple\| {
...	@@ -36936,22 +36936,22 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36936,22 +36936,22 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36936	// In this case the struct has all comptime-known fields and	36936	// In this case the struct has all comptime-known fields and
36937	// therefore has one possible value.	36937	// therefore has one possible value.
36938	// TODO: write something like getCoercedInts to avoid needing to dupe	36938	// TODO: write something like getCoercedInts to avoid needing to dupe
36939	return (try mod.intern(.{ .aggregate = .{	36939	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
36940	.ty = ty.toIntern(),	36940	.ty = ty.toIntern(),
36941	.storage = .{ .elems = try sema.arena.dupe(InternPool.Index, tuple.values.get(ip)) },	36941	.storage = .{ .elems = try sema.arena.dupe(InternPool.Index, tuple.values.get(ip)) },
36942	} })).toValue();	36942	} })));
36943	},	36943	},
36944		36944
36945	.union_type => \|union_type\| {	36945	.union_type => \|union_type\| {
36946	try sema.resolveTypeFields(ty);	36946	try sema.resolveTypeFields(ty);
36947	const union_obj = ip.loadUnionType(union_type);	36947	const union_obj = ip.loadUnionType(union_type);
36948	const tag_val = (try sema.typeHasOnePossibleValue(union_obj.enum_tag_ty.toType())) orelse	36948	const tag_val = (try sema.typeHasOnePossibleValue(Type.fromInterned(union_obj.enum_tag_ty))) orelse
36949	return null;	36949	return null;
36950	if (union_obj.field_types.len == 0) {	36950	if (union_obj.field_types.len == 0) {
36951	const only = try mod.intern(.{ .empty_enum_value = ty.toIntern() });	36951	const only = try mod.intern(.{ .empty_enum_value = ty.toIntern() });
36952	return only.toValue();	36952	return Value.fromInterned(only);
36953	}	36953	}
36954	const only_field_ty = union_obj.field_types.get(ip)[0].toType();	36954	const only_field_ty = Type.fromInterned(union_obj.field_types.get(ip)[0]);
36955	if (only_field_ty.eql(ty, mod)) {	36955	if (only_field_ty.eql(ty, mod)) {
36956	const msg = try Module.ErrorMsg.create(	36956	const msg = try Module.ErrorMsg.create(
36957	sema.gpa,	36957	sema.gpa,
...	@@ -36969,32 +36969,32 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -36969,32 +36969,32 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
36969	.tag = tag_val.toIntern(),	36969	.tag = tag_val.toIntern(),
36970	.val = val_val.toIntern(),	36970	.val = val_val.toIntern(),
36971	} });	36971	} });
36972	return only.toValue();	36972	return Value.fromInterned(only);
36973	},	36973	},
36974		36974
36975	.enum_type => \|enum_type\| switch (enum_type.tag_mode) {	36975	.enum_type => \|enum_type\| switch (enum_type.tag_mode) {
36976	.nonexhaustive => {	36976	.nonexhaustive => {
36977	if (enum_type.tag_ty == .comptime_int_type) return null;	36977	if (enum_type.tag_ty == .comptime_int_type) return null;
36978		36978
36979	if (try sema.typeHasOnePossibleValue(enum_type.tag_ty.toType())) \|int_opv\| {	36979	if (try sema.typeHasOnePossibleValue(Type.fromInterned(enum_type.tag_ty))) \|int_opv\| {
36980	const only = try mod.intern(.{ .enum_tag = .{	36980	const only = try mod.intern(.{ .enum_tag = .{
36981	.ty = ty.toIntern(),	36981	.ty = ty.toIntern(),
36982	.int = int_opv.toIntern(),	36982	.int = int_opv.toIntern(),
36983	} });	36983	} });
36984	return only.toValue();	36984	return Value.fromInterned(only);
36985	}	36985	}
36986		36986
36987	return null;	36987	return null;
36988	},	36988	},
36989	.auto, .explicit => {	36989	.auto, .explicit => {
36990	if (enum_type.tag_ty.toType().hasRuntimeBits(mod)) return null;	36990	if (Type.fromInterned(enum_type.tag_ty).hasRuntimeBits(mod)) return null;
36991		36991
36992	return switch (enum_type.names.len) {	36992	return Value.fromInterned(switch (enum_type.names.len) {
36993	0 => try mod.intern(.{ .empty_enum_value = ty.toIntern() }),	36993	0 => try mod.intern(.{ .empty_enum_value = ty.toIntern() }),
36994	1 => try mod.intern(.{ .enum_tag = .{	36994	1 => try mod.intern(.{ .enum_tag = .{
36995	.ty = ty.toIntern(),	36995	.ty = ty.toIntern(),
36996	.int = if (enum_type.values.len == 0)	36996	.int = if (enum_type.values.len == 0)
36997	(try mod.intValue(enum_type.tag_ty.toType(), 0)).toIntern()	36997	(try mod.intValue(Type.fromInterned(enum_type.tag_ty), 0)).toIntern()
36998	else	36998	else
36999	try mod.intern_pool.getCoercedInts(	36999	try mod.intern_pool.getCoercedInts(
37000	mod.gpa,	37000	mod.gpa,
...	@@ -37003,7 +37003,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {	...	@@ -37003,7 +37003,7 @@ pub fn typeHasOnePossibleValue(sema: *Sema, ty: Type) CompileError!?Value {
37003	),	37003	),
37004	} }),	37004	} }),
37005	else => return null,	37005	else => return null,
37006	}.toValue();	37006	});
37007	},	37007	},
37008	},	37008	},
37009		37009
...	@@ -37092,7 +37092,7 @@ fn analyzeComptimeAlloc(	...	@@ -37092,7 +37092,7 @@ fn analyzeComptimeAlloc(
37092	// There will be stores before the first load, but they may be to sub-elements or	37092	// There will be stores before the first load, but they may be to sub-elements or
37093	// sub-fields. So we need to initialize with undef to allow the mechanism to expand	37093	// sub-fields. So we need to initialize with undef to allow the mechanism to expand
37094	// into fields/elements and have those overridden with stored values.	37094	// into fields/elements and have those overridden with stored values.
37095	(try mod.intern(.{ .undef = var_type.toIntern() })).toValue(),	37095	Value.fromInterned((try mod.intern(.{ .undef = var_type.toIntern() }))),
37096	alignment,	37096	alignment,
37097	);	37097	);
37098	const decl = mod.declPtr(decl_index);	37098	const decl = mod.declPtr(decl_index);
...	@@ -37226,7 +37226,7 @@ fn pointerDerefExtra(sema: Sema, block: Block, src: LazySrcLoc, ptr_val: Value	...	@@ -37226,7 +37226,7 @@ fn pointerDerefExtra(sema: Sema, block: Block, src: LazySrcLoc, ptr_val: Value
37226	// Move mutable decl values to the InternPool and assert other decls are already in	37226	// Move mutable decl values to the InternPool and assert other decls are already in
37227	// the InternPool.	37227	// the InternPool.
37228	const uncoerced_val = if (deref.is_mutable) try tv.val.intern(tv.ty, mod) else tv.val.toIntern();	37228	const uncoerced_val = if (deref.is_mutable) try tv.val.intern(tv.ty, mod) else tv.val.toIntern();
37229	const coerced_val = try mod.getCoerced(uncoerced_val.toValue(), load_ty);	37229	const coerced_val = try mod.getCoerced(Value.fromInterned(uncoerced_val), load_ty);
37230	return .{ .val = coerced_val };	37230	return .{ .val = coerced_val };
37231	}	37231	}
37232	}	37232	}
...	@@ -37284,7 +37284,7 @@ fn typePtrOrOptionalPtrTy(sema: *Sema, ty: Type) !?Type {	...	@@ -37284,7 +37284,7 @@ fn typePtrOrOptionalPtrTy(sema: *Sema, ty: Type) !?Type {
37284	if (ptr_type.flags.is_allowzero) return null;	37284	if (ptr_type.flags.is_allowzero) return null;
37285		37285
37286	// optionals of zero sized types behave like bools, not pointers	37286	// optionals of zero sized types behave like bools, not pointers
37287	const payload_ty = opt_child.toType();	37287	const payload_ty = Type.fromInterned(opt_child);
37288	if ((try sema.typeHasOnePossibleValue(payload_ty)) != null) {	37288	if ((try sema.typeHasOnePossibleValue(payload_ty)) != null) {
37289	return null;	37289	return null;
37290	}	37290	}
...	@@ -37328,7 +37328,7 @@ fn unionFieldAlignment(sema: *Sema, u: InternPool.UnionType, field_index: u32) !	...	@@ -37328,7 +37328,7 @@ fn unionFieldAlignment(sema: *Sema, u: InternPool.UnionType, field_index: u32) !
37328	const ip = &mod.intern_pool;	37328	const ip = &mod.intern_pool;
37329	const field_align = u.fieldAlign(ip, field_index);	37329	const field_align = u.fieldAlign(ip, field_index);
37330	if (field_align != .none) return field_align;	37330	if (field_align != .none) return field_align;
37331	const field_ty = u.field_types.get(ip)[field_index].toType();	37331	const field_ty = Type.fromInterned(u.field_types.get(ip)[field_index]);
37332	if (field_ty.isNoReturn(sema.mod)) return .none;	37332	if (field_ty.isNoReturn(sema.mod)) return .none;
37333	return sema.typeAbiAlignment(field_ty);	37333	return sema.typeAbiAlignment(field_ty);
37334	}	37334	}
...	@@ -37458,10 +37458,10 @@ fn intAddInner(sema: Sema, lhs: Value, rhs: Value, ty: Type, overflow_idx: usi	...	@@ -37458,10 +37458,10 @@ fn intAddInner(sema: Sema, lhs: Value, rhs: Value, ty: Type, overflow_idx: usi
37458	};	37458	};
37459	scalar.* = try val.intern(scalar_ty, mod);	37459	scalar.* = try val.intern(scalar_ty, mod);
37460	}	37460	}
37461	return (try mod.intern(.{ .aggregate = .{	37461	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
37462	.ty = ty.toIntern(),	37462	.ty = ty.toIntern(),
37463	.storage = .{ .elems = result_data },	37463	.storage = .{ .elems = result_data },
37464	} })).toValue();	37464	} })));
37465	}	37465	}
37466	return sema.intAddScalar(lhs, rhs, ty);	37466	return sema.intAddScalar(lhs, rhs, ty);
37467	}	37467	}
...	@@ -37548,10 +37548,10 @@ fn intSubInner(sema: Sema, lhs: Value, rhs: Value, ty: Type, overflow_idx: usi	...	@@ -37548,10 +37548,10 @@ fn intSubInner(sema: Sema, lhs: Value, rhs: Value, ty: Type, overflow_idx: usi
37548	};	37548	};
37549	scalar.* = try val.intern(scalar_ty, mod);	37549	scalar.* = try val.intern(scalar_ty, mod);
37550	}	37550	}
37551	return (try mod.intern(.{ .aggregate = .{	37551	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
37552	.ty = ty.toIntern(),	37552	.ty = ty.toIntern(),
37553	.storage = .{ .elems = result_data },	37553	.storage = .{ .elems = result_data },
37554	} })).toValue();	37554	} })));
37555	}	37555	}
37556	return sema.intSubScalar(lhs, rhs, ty);	37556	return sema.intSubScalar(lhs, rhs, ty);
37557	}	37557	}
...	@@ -37620,14 +37620,14 @@ fn intSubWithOverflow(	...	@@ -37620,14 +37620,14 @@ fn intSubWithOverflow(
37620	scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);	37620	scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);
37621	}	37621	}
37622	return Value.OverflowArithmeticResult{	37622	return Value.OverflowArithmeticResult{
37623	.overflow_bit = (try mod.intern(.{ .aggregate = .{	37623	.overflow_bit = Value.fromInterned((try mod.intern(.{ .aggregate = .{
37624	.ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),	37624	.ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),
37625	.storage = .{ .elems = overflowed_data },	37625	.storage = .{ .elems = overflowed_data },
37626	} })).toValue(),	37626	} }))),
37627	.wrapped_result = (try mod.intern(.{ .aggregate = .{	37627	.wrapped_result = Value.fromInterned((try mod.intern(.{ .aggregate = .{
37628	.ty = ty.toIntern(),	37628	.ty = ty.toIntern(),
37629	.storage = .{ .elems = result_data },	37629	.storage = .{ .elems = result_data },
37630	} })).toValue(),	37630	} }))),
37631	};	37631	};
37632	}	37632	}
37633	return sema.intSubWithOverflowScalar(lhs, rhs, ty);	37633	return sema.intSubWithOverflowScalar(lhs, rhs, ty);
...	@@ -37679,10 +37679,10 @@ fn intFromFloat(	...	@@ -37679,10 +37679,10 @@ fn intFromFloat(
37679	const elem_val = try val.elemValue(sema.mod, i);	37679	const elem_val = try val.elemValue(sema.mod, i);
37680	scalar.* = try (try sema.intFromFloatScalar(block, src, elem_val, elem_ty, int_ty.scalarType(mod), mode)).intern(scalar_ty, mod);	37680	scalar.* = try (try sema.intFromFloatScalar(block, src, elem_val, elem_ty, int_ty.scalarType(mod), mode)).intern(scalar_ty, mod);
37681	}	37681	}
37682	return (try mod.intern(.{ .aggregate = .{	37682	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
37683	.ty = int_ty.toIntern(),	37683	.ty = int_ty.toIntern(),
37684	.storage = .{ .elems = result_data },	37684	.storage = .{ .elems = result_data },
37685	} })).toValue();	37685	} })));
37686	}	37686	}
37687	return sema.intFromFloatScalar(block, src, val, float_ty, int_ty, mode);	37687	return sema.intFromFloatScalar(block, src, val, float_ty, int_ty, mode);
37688	}	37688	}
...	@@ -37792,7 +37792,7 @@ fn intFitsInType(	...	@@ -37792,7 +37792,7 @@ fn intFitsInType(
37792	const max_needed_bits = @as(u16, 16) + @intFromBool(info.signedness == .signed);	37792	const max_needed_bits = @as(u16, 16) + @intFromBool(info.signedness == .signed);
37793	// If it is u16 or bigger we know the alignment fits without resolving it.	37793	// If it is u16 or bigger we know the alignment fits without resolving it.
37794	if (info.bits >= max_needed_bits) return true;	37794	if (info.bits >= max_needed_bits) return true;
37795	const x = try sema.typeAbiAlignment(lazy_ty.toType());	37795	const x = try sema.typeAbiAlignment(Type.fromInterned(lazy_ty));
37796	if (x == .none) return true;	37796	if (x == .none) return true;
37797	const actual_needed_bits = @as(usize, x.toLog2Units()) + 1 + @intFromBool(info.signedness == .signed);	37797	const actual_needed_bits = @as(usize, x.toLog2Units()) + 1 + @intFromBool(info.signedness == .signed);
37798	return info.bits >= actual_needed_bits;	37798	return info.bits >= actual_needed_bits;
...	@@ -37801,7 +37801,7 @@ fn intFitsInType(	...	@@ -37801,7 +37801,7 @@ fn intFitsInType(
37801	const max_needed_bits = @as(u16, 64) + @intFromBool(info.signedness == .signed);	37801	const max_needed_bits = @as(u16, 64) + @intFromBool(info.signedness == .signed);
37802	// If it is u64 or bigger we know the size fits without resolving it.	37802	// If it is u64 or bigger we know the size fits without resolving it.
37803	if (info.bits >= max_needed_bits) return true;	37803	if (info.bits >= max_needed_bits) return true;
37804	const x = try sema.typeAbiSize(lazy_ty.toType());	37804	const x = try sema.typeAbiSize(Type.fromInterned(lazy_ty));
37805	if (x == 0) return true;	37805	if (x == 0) return true;
37806	const actual_needed_bits = std.math.log2(x) + 1 + @intFromBool(info.signedness == .signed);	37806	const actual_needed_bits = std.math.log2(x) + 1 + @intFromBool(info.signedness == .signed);
37807	return info.bits >= actual_needed_bits;	37807	return info.bits >= actual_needed_bits;
...	@@ -37822,7 +37822,7 @@ fn intFitsInType(	...	@@ -37822,7 +37822,7 @@ fn intFitsInType(
37822	.elems => \|elems\| elems,	37822	.elems => \|elems\| elems,
37823	.repeated_elem => \|elem\| @as(*const [1]InternPool.Index, &elem),	37823	.repeated_elem => \|elem\| @as(*const [1]InternPool.Index, &elem),
37824	}, 0..) \|elem, i\| {	37824	}, 0..) \|elem, i\| {
37825	if (try sema.intFitsInType(elem.toValue(), ty.scalarType(mod), null)) continue;	37825	if (try sema.intFitsInType(Value.fromInterned(elem), ty.scalarType(mod), null)) continue;
37826	if (vector_index) \|vi\| vi.* = i;	37826	if (vector_index) \|vi\| vi.* = i;
37827	break false;	37827	break false;
37828	} else true,	37828	} else true,
...	@@ -37848,8 +37848,8 @@ fn enumHasInt(sema: *Sema, ty: Type, int: Value) CompileError!bool {	...	@@ -37848,8 +37848,8 @@ fn enumHasInt(sema: *Sema, ty: Type, int: Value) CompileError!bool {
37848	assert(enum_type.tag_mode != .nonexhaustive);	37848	assert(enum_type.tag_mode != .nonexhaustive);
37849	// The `tagValueIndex` function call below relies on the type being the integer tag type.	37849	// The `tagValueIndex` function call below relies on the type being the integer tag type.
37850	// `getCoerced` assumes the value will fit the new type.	37850	// `getCoerced` assumes the value will fit the new type.
37851	if (!(try sema.intFitsInType(int, enum_type.tag_ty.toType(), null))) return false;	37851	if (!(try sema.intFitsInType(int, Type.fromInterned(enum_type.tag_ty), null))) return false;
37852	const int_coerced = try mod.getCoerced(int, enum_type.tag_ty.toType());	37852	const int_coerced = try mod.getCoerced(int, Type.fromInterned(enum_type.tag_ty));
37853		37853
37854	return enum_type.tagValueIndex(&mod.intern_pool, int_coerced.toIntern()) != null;	37854	return enum_type.tagValueIndex(&mod.intern_pool, int_coerced.toIntern()) != null;
37855	}	37855	}
...	@@ -37874,14 +37874,14 @@ fn intAddWithOverflow(	...	@@ -37874,14 +37874,14 @@ fn intAddWithOverflow(
37874	scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);	37874	scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);
37875	}	37875	}
37876	return Value.OverflowArithmeticResult{	37876	return Value.OverflowArithmeticResult{
37877	.overflow_bit = (try mod.intern(.{ .aggregate = .{	37877	.overflow_bit = Value.fromInterned((try mod.intern(.{ .aggregate = .{
37878	.ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),	37878	.ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),
37879	.storage = .{ .elems = overflowed_data },	37879	.storage = .{ .elems = overflowed_data },
37880	} })).toValue(),	37880	} }))),
37881	.wrapped_result = (try mod.intern(.{ .aggregate = .{	37881	.wrapped_result = Value.fromInterned((try mod.intern(.{ .aggregate = .{
37882	.ty = ty.toIntern(),	37882	.ty = ty.toIntern(),
37883	.storage = .{ .elems = result_data },	37883	.storage = .{ .elems = result_data },
37884	} })).toValue(),	37884	} }))),
37885	};	37885	};
37886	}	37886	}
37887	return sema.intAddWithOverflowScalar(lhs, rhs, ty);	37887	return sema.intAddWithOverflowScalar(lhs, rhs, ty);
...	@@ -37983,10 +37983,10 @@ fn compareVector(	...	@@ -37983,10 +37983,10 @@ fn compareVector(
37983	const res_bool = try sema.compareScalar(lhs_elem, op, rhs_elem, ty.scalarType(mod));	37983	const res_bool = try sema.compareScalar(lhs_elem, op, rhs_elem, ty.scalarType(mod));
37984	scalar.* = try Value.makeBool(res_bool).intern(Type.bool, mod);	37984	scalar.* = try Value.makeBool(res_bool).intern(Type.bool, mod);
37985	}	37985	}
37986	return (try mod.intern(.{ .aggregate = .{	37986	return Value.fromInterned((try mod.intern(.{ .aggregate = .{
37987	.ty = (try mod.vectorType(.{ .len = ty.vectorLen(mod), .child = .bool_type })).toIntern(),	37987	.ty = (try mod.vectorType(.{ .len = ty.vectorLen(mod), .child = .bool_type })).toIntern(),
37988	.storage = .{ .elems = result_data },	37988	.storage = .{ .elems = result_data },
37989	} })).toValue();	37989	} })));
37990	}	37990	}
37991		37991
37992	/// Returns the type of a pointer to an element.	37992	/// Returns the type of a pointer to an element.
...	@@ -38102,7 +38102,7 @@ fn isKnownZigType(sema: *Sema, ref: Air.Inst.Ref, tag: std.builtin.TypeId) bool	...	@@ -38102,7 +38102,7 @@ fn isKnownZigType(sema: *Sema, ref: Air.Inst.Ref, tag: std.builtin.TypeId) bool
38102		38102
38103	fn ptrType(sema: *Sema, info: InternPool.Key.PtrType) CompileError!Type {	38103	fn ptrType(sema: *Sema, info: InternPool.Key.PtrType) CompileError!Type {
38104	if (info.flags.alignment != .none) {	38104	if (info.flags.alignment != .none) {
38105	_ = try sema.typeAbiAlignment(info.child.toType());	38105	_ = try sema.typeAbiAlignment(Type.fromInterned(info.child));
38106	}	38106	}
38107	return sema.mod.ptrType(info);	38107	return sema.mod.ptrType(info);
38108	}	38108	}

src/TypedValue.zig+25-25

...	@@ -89,7 +89,7 @@ pub fn print(	...	@@ -89,7 +89,7 @@ pub fn print(
89		89
90	if (payload.tag) \|tag\| {	90	if (payload.tag) \|tag\| {
91	try print(.{	91	try print(.{
92	.ty = ip.indexToKey(ty.toIntern()).union_type.enum_tag_ty.toType(),	92	.ty = Type.fromInterned(ip.indexToKey(ty.toIntern()).union_type.enum_tag_ty),
93	.val = tag,	93	.val = tag,
94	}, writer, level - 1, mod);	94	}, writer, level - 1, mod);
95	try writer.writeAll(" = ");	95	try writer.writeAll(" = ");
...	@@ -222,10 +222,10 @@ pub fn print(	...	@@ -222,10 +222,10 @@ pub fn print(
222	.int => \|int\| switch (int.storage) {	222	.int => \|int\| switch (int.storage) {
223	inline .u64, .i64, .big_int => \|x\| return writer.print("{}", .{x}),	223	inline .u64, .i64, .big_int => \|x\| return writer.print("{}", .{x}),
224	.lazy_align => \|lazy_ty\| return writer.print("{d}", .{	224	.lazy_align => \|lazy_ty\| return writer.print("{d}", .{
225	lazy_ty.toType().abiAlignment(mod),	225	Type.fromInterned(lazy_ty).abiAlignment(mod),
226	}),	226	}),
227	.lazy_size => \|lazy_ty\| return writer.print("{d}", .{	227	.lazy_size => \|lazy_ty\| return writer.print("{d}", .{
228	lazy_ty.toType().abiSize(mod),	228	Type.fromInterned(lazy_ty).abiSize(mod),
229	}),	229	}),
230	},	230	},
231	.err => \|err\| return writer.print("error.{}", .{	231	.err => \|err\| return writer.print("error.{}", .{
...	@@ -236,7 +236,7 @@ pub fn print(	...	@@ -236,7 +236,7 @@ pub fn print(
236	err_name.fmt(ip),	236	err_name.fmt(ip),
237	}),	237	}),
238	.payload => \|payload\| {	238	.payload => \|payload\| {
239	val = payload.toValue();	239	val = Value.fromInterned(payload);
240	ty = ty.errorUnionPayload(mod);	240	ty = ty.errorUnionPayload(mod);
241	},	241	},
242	},	242	},
...	@@ -254,8 +254,8 @@ pub fn print(	...	@@ -254,8 +254,8 @@ pub fn print(
254	}	254	}
255	try writer.writeAll("@enumFromInt(");	255	try writer.writeAll("@enumFromInt(");
256	try print(.{	256	try print(.{
257	.ty = ip.typeOf(enum_tag.int).toType(),	257	.ty = Type.fromInterned(ip.typeOf(enum_tag.int)),
258	.val = enum_tag.int.toValue(),	258	.val = Value.fromInterned(enum_tag.int),
259	}, writer, level - 1, mod);	259	}, writer, level - 1, mod);
260	try writer.writeAll(")");	260	try writer.writeAll(")");
261	return;	261	return;
...	@@ -280,8 +280,8 @@ pub fn print(	...	@@ -280,8 +280,8 @@ pub fn print(
280	if (level == 0) {	280	if (level == 0) {
281	return writer.writeAll(".{ ... }");	281	return writer.writeAll(".{ ... }");
282	}	282	}
283	const elem_ty = ptr_ty.child.toType();	283	const elem_ty = Type.fromInterned(ptr_ty.child);
284	const len = ptr.len.toValue().toUnsignedInt(mod);	284	const len = Value.fromInterned(ptr.len).toUnsignedInt(mod);
285	if (elem_ty.eql(Type.u8, mod)) str: {	285	if (elem_ty.eql(Type.u8, mod)) str: {
286	const max_len = @min(len, max_string_len);	286	const max_len = @min(len, max_string_len);
287	var buf: [max_string_len]u8 = undefined;	287	var buf: [max_string_len]u8 = undefined;
...	@@ -326,8 +326,8 @@ pub fn print(	...	@@ -326,8 +326,8 @@ pub fn print(
326	@intFromEnum(decl_val),	326	@intFromEnum(decl_val),
327	});	327	});
328	return print(.{	328	return print(.{
329	.ty = ip.typeOf(decl_val).toType(),	329	.ty = Type.fromInterned(ip.typeOf(decl_val)),
330	.val = decl_val.toValue(),	330	.val = Value.fromInterned(decl_val),
331	}, writer, level - 1, mod);	331	}, writer, level - 1, mod);
332	},	332	},
333	.mut_decl => \|mut_decl\| {	333	.mut_decl => \|mut_decl\| {
...	@@ -340,38 +340,38 @@ pub fn print(	...	@@ -340,38 +340,38 @@ pub fn print(
340	},	340	},
341	.comptime_field => \|field_val_ip\| {	341	.comptime_field => \|field_val_ip\| {
342	return print(.{	342	return print(.{
343	.ty = ip.typeOf(field_val_ip).toType(),	343	.ty = Type.fromInterned(ip.typeOf(field_val_ip)),
344	.val = field_val_ip.toValue(),	344	.val = Value.fromInterned(field_val_ip),
345	}, writer, level - 1, mod);	345	}, writer, level - 1, mod);
346	},	346	},
347	.int => unreachable,	347	.int => unreachable,
348	.eu_payload => \|eu_ip\| {	348	.eu_payload => \|eu_ip\| {
349	try writer.writeAll("(payload of ");	349	try writer.writeAll("(payload of ");
350	try print(.{	350	try print(.{
351	.ty = ip.typeOf(eu_ip).toType(),	351	.ty = Type.fromInterned(ip.typeOf(eu_ip)),
352	.val = eu_ip.toValue(),	352	.val = Value.fromInterned(eu_ip),
353	}, writer, level - 1, mod);	353	}, writer, level - 1, mod);
354	try writer.writeAll(")");	354	try writer.writeAll(")");
355	},	355	},
356	.opt_payload => \|opt_ip\| {	356	.opt_payload => \|opt_ip\| {
357	try print(.{	357	try print(.{
358	.ty = ip.typeOf(opt_ip).toType(),	358	.ty = Type.fromInterned(ip.typeOf(opt_ip)),
359	.val = opt_ip.toValue(),	359	.val = Value.fromInterned(opt_ip),
360	}, writer, level - 1, mod);	360	}, writer, level - 1, mod);
361	try writer.writeAll(".?");	361	try writer.writeAll(".?");
362	},	362	},
363	.elem => \|elem\| {	363	.elem => \|elem\| {
364	try print(.{	364	try print(.{
365	.ty = ip.typeOf(elem.base).toType(),	365	.ty = Type.fromInterned(ip.typeOf(elem.base)),
366	.val = elem.base.toValue(),	366	.val = Value.fromInterned(elem.base),
367	}, writer, level - 1, mod);	367	}, writer, level - 1, mod);
368	try writer.print("[{}]", .{elem.index});	368	try writer.print("[{}]", .{elem.index});
369	},	369	},
370	.field => \|field\| {	370	.field => \|field\| {
371	const ptr_container_ty = ip.typeOf(field.base).toType();	371	const ptr_container_ty = Type.fromInterned(ip.typeOf(field.base));
372	try print(.{	372	try print(.{
373	.ty = ptr_container_ty,	373	.ty = ptr_container_ty,
374	.val = field.base.toValue(),	374	.val = Value.fromInterned(field.base),
375	}, writer, level - 1, mod);	375	}, writer, level - 1, mod);
376		376
377	const container_ty = ptr_container_ty.childType(mod);	377	const container_ty = ptr_container_ty.childType(mod);
...	@@ -404,7 +404,7 @@ pub fn print(	...	@@ -404,7 +404,7 @@ pub fn print(
404	.opt => \|opt\| switch (opt.val) {	404	.opt => \|opt\| switch (opt.val) {
405	.none => return writer.writeAll("null"),	405	.none => return writer.writeAll("null"),
406	else => \|payload\| {	406	else => \|payload\| {
407	val = payload.toValue();	407	val = Value.fromInterned(payload);
408	ty = ty.optionalChild(mod);	408	ty = ty.optionalChild(mod);
409	},	409	},
410	},	410	},
...	@@ -426,20 +426,20 @@ pub fn print(	...	@@ -426,20 +426,20 @@ pub fn print(
426	if (un.tag != .none) {	426	if (un.tag != .none) {
427	try print(.{	427	try print(.{
428	.ty = ty.unionTagTypeHypothetical(mod),	428	.ty = ty.unionTagTypeHypothetical(mod),
429	.val = un.tag.toValue(),	429	.val = Value.fromInterned(un.tag),
430	}, writer, level - 1, mod);	430	}, writer, level - 1, mod);
431	try writer.writeAll(" = ");	431	try writer.writeAll(" = ");
432	const field_ty = ty.unionFieldType(un.tag.toValue(), mod).?;	432	const field_ty = ty.unionFieldType(Value.fromInterned(un.tag), mod).?;
433	try print(.{	433	try print(.{
434	.ty = field_ty,	434	.ty = field_ty,
435	.val = un.val.toValue(),	435	.val = Value.fromInterned(un.val),
436	}, writer, level - 1, mod);	436	}, writer, level - 1, mod);
437	} else {	437	} else {
438	try writer.writeAll("(unknown tag) = ");	438	try writer.writeAll("(unknown tag) = ");
439	const backing_ty = try ty.unionBackingType(mod);	439	const backing_ty = try ty.unionBackingType(mod);
440	try print(.{	440	try print(.{
441	.ty = backing_ty,	441	.ty = backing_ty,
442	.val = un.val.toValue(),	442	.val = Value.fromInterned(un.val),
443	}, writer, level - 1, mod);	443	}, writer, level - 1, mod);
444	}	444	}
445	} else try writer.writeAll("...");	445	} else try writer.writeAll("...");

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

...	@@ -6245,7 +6245,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6245,7 +6245,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6245	}	6245	}
6246		6246
6247	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	6247	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
6248	const param_size = @as(u32, @intCast(ty.toType().abiSize(mod)));	6248	const param_size = @as(u32, @intCast(Type.fromInterned(ty).abiSize(mod)));
6249	if (param_size == 0) {	6249	if (param_size == 0) {
6250	result_arg.* = .{ .none = {} };	6250	result_arg.* = .{ .none = {} };
6251	continue;	6251	continue;
...	@@ -6253,14 +6253,14 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6253,14 +6253,14 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6253		6253
6254	// We round up NCRN only for non-Apple platforms which allow the 16-byte aligned	6254	// We round up NCRN only for non-Apple platforms which allow the 16-byte aligned
6255	// values to spread across odd-numbered registers.	6255	// values to spread across odd-numbered registers.
6256	if (ty.toType().abiAlignment(mod) == .@"16" and !self.target.isDarwin()) {	6256	if (Type.fromInterned(ty).abiAlignment(mod) == .@"16" and !self.target.isDarwin()) {
6257	// Round up NCRN to the next even number	6257	// Round up NCRN to the next even number
6258	ncrn += ncrn % 2;	6258	ncrn += ncrn % 2;
6259	}	6259	}
6260		6260
6261	if (std.math.divCeil(u32, param_size, 8) catch unreachable <= 8 - ncrn) {	6261	if (std.math.divCeil(u32, param_size, 8) catch unreachable <= 8 - ncrn) {
6262	if (param_size <= 8) {	6262	if (param_size <= 8) {
6263	result_arg.* = .{ .register = self.registerAlias(c_abi_int_param_regs[ncrn], ty.toType()) };	6263	result_arg.* = .{ .register = self.registerAlias(c_abi_int_param_regs[ncrn], Type.fromInterned(ty)) };
6264	ncrn += 1;	6264	ncrn += 1;
6265	} else {	6265	} else {
6266	return self.fail("TODO MCValues with multiple registers", .{});	6266	return self.fail("TODO MCValues with multiple registers", .{});
...	@@ -6271,7 +6271,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6271,7 +6271,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6271	ncrn = 8;	6271	ncrn = 8;
6272	// TODO Apple allows the arguments on the stack to be non-8-byte aligned provided	6272	// TODO Apple allows the arguments on the stack to be non-8-byte aligned provided
6273	// that the entire stack space consumed by the arguments is 8-byte aligned.	6273	// that the entire stack space consumed by the arguments is 8-byte aligned.
6274	if (ty.toType().abiAlignment(mod) == .@"8") {	6274	if (Type.fromInterned(ty).abiAlignment(mod) == .@"8") {
6275	if (nsaa % 8 != 0) {	6275	if (nsaa % 8 != 0) {
6276	nsaa += 8 - (nsaa % 8);	6276	nsaa += 8 - (nsaa % 8);
6277	}	6277	}
...	@@ -6310,9 +6310,9 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6310,9 +6310,9 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6310	var stack_offset: u32 = 0;	6310	var stack_offset: u32 = 0;
6311		6311
6312	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	6312	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
6313	if (ty.toType().abiSize(mod) > 0) {	6313	if (Type.fromInterned(ty).abiSize(mod) > 0) {
6314	const param_size: u32 = @intCast(ty.toType().abiSize(mod));	6314	const param_size: u32 = @intCast(Type.fromInterned(ty).abiSize(mod));
6315	const param_alignment = ty.toType().abiAlignment(mod);	6315	const param_alignment = Type.fromInterned(ty).abiAlignment(mod);
6316		6316
6317	stack_offset = @intCast(param_alignment.forward(stack_offset));	6317	stack_offset = @intCast(param_alignment.forward(stack_offset));
6318	result_arg.* = .{ .stack_argument_offset = stack_offset };	6318	result_arg.* = .{ .stack_argument_offset = stack_offset };

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

...	@@ -83,7 +83,7 @@ fn countFloats(ty: Type, mod: Module, maybe_float_bits: ?u16) u8 {	...	@@ -83,7 +83,7 @@ fn countFloats(ty: Type, mod: Module, maybe_float_bits: ?u16) u8 {
83	const union_obj = mod.typeToUnion(ty).?;	83	const union_obj = mod.typeToUnion(ty).?;
84	var max_count: u8 = 0;	84	var max_count: u8 = 0;
85	for (union_obj.field_types.get(ip)) \|field_ty\| {	85	for (union_obj.field_types.get(ip)) \|field_ty\| {
86	const field_count = countFloats(field_ty.toType(), mod, maybe_float_bits);	86	const field_count = countFloats(Type.fromInterned(field_ty), mod, maybe_float_bits);
87	if (field_count == invalid) return invalid;	87	if (field_count == invalid) return invalid;
88	if (field_count > max_count) max_count = field_count;	88	if (field_count > max_count) max_count = field_count;
89	if (max_count > sret_float_count) return invalid;	89	if (max_count > sret_float_count) return invalid;
...	@@ -122,7 +122,7 @@ pub fn getFloatArrayType(ty: Type, mod: *Module) ?Type {	...	@@ -122,7 +122,7 @@ pub fn getFloatArrayType(ty: Type, mod: *Module) ?Type {
122	.Union => {	122	.Union => {
123	const union_obj = mod.typeToUnion(ty).?;	123	const union_obj = mod.typeToUnion(ty).?;
124	for (union_obj.field_types.get(ip)) \|field_ty\| {	124	for (union_obj.field_types.get(ip)) \|field_ty\| {
125	if (getFloatArrayType(field_ty.toType(), mod)) \|some\| return some;	125	if (getFloatArrayType(Type.fromInterned(field_ty), mod)) \|some\| return some;
126	}	126	}
127	return null;	127	return null;
128	},	128	},

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

...	@@ -6209,10 +6209,10 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6209,10 +6209,10 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6209	}	6209	}
6210		6210
6211	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	6211	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
6212	if (ty.toType().abiAlignment(mod) == .@"8")	6212	if (Type.fromInterned(ty).abiAlignment(mod) == .@"8")
6213	ncrn = std.mem.alignForward(usize, ncrn, 2);	6213	ncrn = std.mem.alignForward(usize, ncrn, 2);
6214		6214
6215	const param_size = @as(u32, @intCast(ty.toType().abiSize(mod)));	6215	const param_size = @as(u32, @intCast(Type.fromInterned(ty).abiSize(mod)));
6216	if (std.math.divCeil(u32, param_size, 4) catch unreachable <= 4 - ncrn) {	6216	if (std.math.divCeil(u32, param_size, 4) catch unreachable <= 4 - ncrn) {
6217	if (param_size <= 4) {	6217	if (param_size <= 4) {
6218	result_arg.* = .{ .register = c_abi_int_param_regs[ncrn] };	6218	result_arg.* = .{ .register = c_abi_int_param_regs[ncrn] };
...	@@ -6224,7 +6224,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6224,7 +6224,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6224	return self.fail("TODO MCValues split between registers and stack", .{});	6224	return self.fail("TODO MCValues split between registers and stack", .{});
6225	} else {	6225	} else {
6226	ncrn = 4;	6226	ncrn = 4;
6227	if (ty.toType().abiAlignment(mod) == .@"8")	6227	if (Type.fromInterned(ty).abiAlignment(mod) == .@"8")
6228	nsaa = std.mem.alignForward(u32, nsaa, 8);	6228	nsaa = std.mem.alignForward(u32, nsaa, 8);
6229		6229
6230	result_arg.* = .{ .stack_argument_offset = nsaa };	6230	result_arg.* = .{ .stack_argument_offset = nsaa };
...	@@ -6259,9 +6259,9 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -6259,9 +6259,9 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
6259	var stack_offset: u32 = 0;	6259	var stack_offset: u32 = 0;
6260		6260
6261	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	6261	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
6262	if (ty.toType().abiSize(mod) > 0) {	6262	if (Type.fromInterned(ty).abiSize(mod) > 0) {
6263	const param_size: u32 = @intCast(ty.toType().abiSize(mod));	6263	const param_size: u32 = @intCast(Type.fromInterned(ty).abiSize(mod));
6264	const param_alignment = ty.toType().abiAlignment(mod);	6264	const param_alignment = Type.fromInterned(ty).abiAlignment(mod);
6265		6265
6266	stack_offset = @intCast(param_alignment.forward(stack_offset));	6266	stack_offset = @intCast(param_alignment.forward(stack_offset));
6267	result_arg.* = .{ .stack_argument_offset = stack_offset };	6267	result_arg.* = .{ .stack_argument_offset = stack_offset };

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

...	@@ -65,7 +65,7 @@ pub fn classifyType(ty: Type, mod: *Module, ctx: Context) Class {	...	@@ -65,7 +65,7 @@ pub fn classifyType(ty: Type, mod: *Module, ctx: Context) Class {
65	if (float_count <= byval_float_count) return .byval;	65	if (float_count <= byval_float_count) return .byval;
66		66
67	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {	67	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {
68	if (field_ty.toType().bitSize(mod) > 32 or	68	if (Type.fromInterned(field_ty).bitSize(mod) > 32 or
69	mod.unionFieldNormalAlignment(union_obj, @intCast(field_index)).compare(.gt, .@"32"))	69	mod.unionFieldNormalAlignment(union_obj, @intCast(field_index)).compare(.gt, .@"32"))
70	{	70	{
71	return Class.arrSize(bit_size, 64);	71	return Class.arrSize(bit_size, 64);
...	@@ -129,7 +129,7 @@ fn countFloats(ty: Type, mod: Module, maybe_float_bits: ?u16) u32 {	...	@@ -129,7 +129,7 @@ fn countFloats(ty: Type, mod: Module, maybe_float_bits: ?u16) u32 {
129	const union_obj = mod.typeToUnion(ty).?;	129	const union_obj = mod.typeToUnion(ty).?;
130	var max_count: u32 = 0;	130	var max_count: u32 = 0;
131	for (union_obj.field_types.get(ip)) \|field_ty\| {	131	for (union_obj.field_types.get(ip)) \|field_ty\| {
132	const field_count = countFloats(field_ty.toType(), mod, maybe_float_bits);	132	const field_count = countFloats(Type.fromInterned(field_ty), mod, maybe_float_bits);
133	if (field_count == invalid) return invalid;	133	if (field_count == invalid) return invalid;
134	if (field_count > max_count) max_count = field_count;	134	if (field_count > max_count) max_count = field_count;
135	if (max_count > byval_float_count) return invalid;	135	if (max_count > byval_float_count) return invalid;

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

...	@@ -2656,7 +2656,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {	...	@@ -2656,7 +2656,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type) !CallMCValues {
2656	const argument_registers = [_]Register{ .a0, .a1, .a2, .a3, .a4, .a5, .a6, .a7 };	2656	const argument_registers = [_]Register{ .a0, .a1, .a2, .a3, .a4, .a5, .a6, .a7 };
2657		2657
2658	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	2658	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
2659	const param_size = @as(u32, @intCast(ty.toType().abiSize(mod)));	2659	const param_size = @as(u32, @intCast(Type.fromInterned(ty).abiSize(mod)));
2660	if (param_size <= 8) {	2660	if (param_size <= 8) {
2661	if (next_register < argument_registers.len) {	2661	if (next_register < argument_registers.len) {
2662	result_arg.* = .{ .register = argument_registers[next_register] };	2662	result_arg.* = .{ .register = argument_registers[next_register] };

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

...	@@ -4493,7 +4493,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type, role: RegisterView)	...	@@ -4493,7 +4493,7 @@ fn resolveCallingConventionValues(self: *Self, fn_ty: Type, role: RegisterView)
4493	};	4493	};
4494		4494
4495	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {	4495	for (fn_info.param_types.get(ip), result.args) \|ty, *result_arg\| {
4496	const param_size = @as(u32, @intCast(ty.toType().abiSize(mod)));	4496	const param_size = @as(u32, @intCast(Type.fromInterned(ty).abiSize(mod)));
4497	if (param_size <= 8) {	4497	if (param_size <= 8) {
4498	if (next_register < argument_registers.len) {	4498	if (next_register < argument_registers.len) {
4499	result_arg.* = .{ .register = argument_registers[next_register] };	4499	result_arg.* = .{ .register = argument_registers[next_register] };

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

src/arch/wasm/abi.zig+4-4

...	@@ -37,7 +37,7 @@ pub fn classifyType(ty: Type, mod: *Module) [2]Class {	...	@@ -37,7 +37,7 @@ pub fn classifyType(ty: Type, mod: *Module) [2]Class {
37	// The struct type is non-scalar.	37	// The struct type is non-scalar.
38	return memory;	38	return memory;
39	}	39	}
40	const field_ty = struct_type.field_types.get(ip)[0].toType();	40	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[0]);
41	const explicit_align = struct_type.fieldAlign(ip, 0);	41	const explicit_align = struct_type.fieldAlign(ip, 0);
42	if (explicit_align != .none) {	42	if (explicit_align != .none) {
43	if (explicit_align.compareStrict(.gt, field_ty.abiAlignment(mod)))	43	if (explicit_align.compareStrict(.gt, field_ty.abiAlignment(mod)))
...	@@ -76,7 +76,7 @@ pub fn classifyType(ty: Type, mod: *Module) [2]Class {	...	@@ -76,7 +76,7 @@ pub fn classifyType(ty: Type, mod: *Module) [2]Class {
76	const layout = ty.unionGetLayout(mod);	76	const layout = ty.unionGetLayout(mod);
77	assert(layout.tag_size == 0);	77	assert(layout.tag_size == 0);
78	if (union_obj.field_names.len > 1) return memory;	78	if (union_obj.field_names.len > 1) return memory;
79	const first_field_ty = union_obj.field_types.get(ip)[0].toType();	79	const first_field_ty = Type.fromInterned(union_obj.field_types.get(ip)[0]);
80	return classifyType(first_field_ty, mod);	80	return classifyType(first_field_ty, mod);
81	},	81	},
82	.ErrorUnion,	82	.ErrorUnion,
...	@@ -104,7 +104,7 @@ pub fn scalarType(ty: Type, mod: *Module) Type {	...	@@ -104,7 +104,7 @@ pub fn scalarType(ty: Type, mod: *Module) Type {
104	switch (ty.zigTypeTag(mod)) {	104	switch (ty.zigTypeTag(mod)) {
105	.Struct => {	105	.Struct => {
106	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {	106	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {
107	return scalarType(packed_struct.backingIntType(ip).toType(), mod);	107	return scalarType(Type.fromInterned(packed_struct.backingIntType(ip).*), mod);
108	} else {	108	} else {
109	assert(ty.structFieldCount(mod) == 1);	109	assert(ty.structFieldCount(mod) == 1);
110	return scalarType(ty.structFieldType(0, mod), mod);	110	return scalarType(ty.structFieldType(0, mod), mod);
...	@@ -119,7 +119,7 @@ pub fn scalarType(ty: Type, mod: *Module) Type {	...	@@ -119,7 +119,7 @@ pub fn scalarType(ty: Type, mod: *Module) Type {
119	}	119	}
120	assert(union_obj.field_types.len == 1);	120	assert(union_obj.field_types.len == 1);
121	}	121	}
122	const first_field_ty = union_obj.field_types.get(ip)[0].toType();	122	const first_field_ty = Type.fromInterned(union_obj.field_types.get(ip)[0]);
123	return scalarType(first_field_ty, mod);	123	return scalarType(first_field_ty, mod);
124	},	124	},
125	else => return ty,	125	else => return ty,

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

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

src/codegen.zig+44-44

...	@@ -259,10 +259,10 @@ pub fn generateSymbol(	...	@@ -259,10 +259,10 @@ pub fn generateSymbol(
259	const begin = code.items.len;	259	const begin = code.items.len;
260	switch (try generateSymbol(bin_file, src_loc, .{	260	switch (try generateSymbol(bin_file, src_loc, .{
261	.ty = payload_ty,	261	.ty = payload_ty,
262	.val = switch (error_union.val) {	262	.val = Value.fromInterned(switch (error_union.val) {
263	.err_name => try mod.intern(.{ .undef = payload_ty.toIntern() }),	263	.err_name => try mod.intern(.{ .undef = payload_ty.toIntern() }),
264	.payload => \|payload\| payload,	264	.payload => \|payload\| payload,
265	}.toValue(),	265	}),
266	}, code, debug_output, reloc_info)) {	266	}, code, debug_output, reloc_info)) {
267	.ok => {},	267	.ok => {},
268	.fail => \|em\| return .{ .fail = em },	268	.fail => \|em\| return .{ .fail = em },
...	@@ -293,7 +293,7 @@ pub fn generateSymbol(	...	@@ -293,7 +293,7 @@ pub fn generateSymbol(
293	const int_tag_ty = typed_value.ty.intTagType(mod);	293	const int_tag_ty = typed_value.ty.intTagType(mod);
294	switch (try generateSymbol(bin_file, src_loc, .{	294	switch (try generateSymbol(bin_file, src_loc, .{
295	.ty = int_tag_ty,	295	.ty = int_tag_ty,
296	.val = try mod.getCoerced(enum_tag.int.toValue(), int_tag_ty),	296	.val = try mod.getCoerced(Value.fromInterned(enum_tag.int), int_tag_ty),
297	}, code, debug_output, reloc_info)) {	297	}, code, debug_output, reloc_info)) {
298	.ok => {},	298	.ok => {},
299	.fail => \|em\| return .{ .fail = em },	299	.fail => \|em\| return .{ .fail = em },
...	@@ -323,7 +323,7 @@ pub fn generateSymbol(	...	@@ -323,7 +323,7 @@ pub fn generateSymbol(
323	// generate len	323	// generate len
324	switch (try generateSymbol(bin_file, src_loc, .{	324	switch (try generateSymbol(bin_file, src_loc, .{
325	.ty = Type.usize,	325	.ty = Type.usize,
326	.val = ptr.len.toValue(),	326	.val = Value.fromInterned(ptr.len),
327	}, code, debug_output, reloc_info)) {	327	}, code, debug_output, reloc_info)) {
328	.ok => {},	328	.ok => {},
329	.fail => \|em\| return Result{ .fail = em },	329	.fail => \|em\| return Result{ .fail = em },
...	@@ -350,7 +350,7 @@ pub fn generateSymbol(	...	@@ -350,7 +350,7 @@ pub fn generateSymbol(
350	} else {	350	} else {
351	const padding = abi_size - (math.cast(usize, payload_type.abiSize(mod)) orelse return error.Overflow) - 1;	351	const padding = abi_size - (math.cast(usize, payload_type.abiSize(mod)) orelse return error.Overflow) - 1;
352	if (payload_type.hasRuntimeBits(mod)) {	352	if (payload_type.hasRuntimeBits(mod)) {
353	const value = payload_val orelse (try mod.intern(.{ .undef = payload_type.toIntern() })).toValue();	353	const value = payload_val orelse Value.fromInterned((try mod.intern(.{ .undef = payload_type.toIntern() })));
354	switch (try generateSymbol(bin_file, src_loc, .{	354	switch (try generateSymbol(bin_file, src_loc, .{
355	.ty = payload_type,	355	.ty = payload_type,
356	.val = value,	356	.val = value,
...	@@ -372,15 +372,15 @@ pub fn generateSymbol(	...	@@ -372,15 +372,15 @@ pub fn generateSymbol(
372	array_type.len + @intFromBool(array_type.sentinel != .none);	372	array_type.len + @intFromBool(array_type.sentinel != .none);
373	while (index < len_including_sentinel) : (index += 1) {	373	while (index < len_including_sentinel) : (index += 1) {
374	switch (try generateSymbol(bin_file, src_loc, .{	374	switch (try generateSymbol(bin_file, src_loc, .{
375	.ty = array_type.child.toType(),	375	.ty = Type.fromInterned(array_type.child),
376	.val = switch (aggregate.storage) {	376	.val = Value.fromInterned(switch (aggregate.storage) {
377	.bytes => unreachable,	377	.bytes => unreachable,
378	.elems => \|elems\| elems[@as(usize, @intCast(index))],	378	.elems => \|elems\| elems[@as(usize, @intCast(index))],
379	.repeated_elem => \|elem\| if (index < array_type.len)	379	.repeated_elem => \|elem\| if (index < array_type.len)
380	elem	380	elem
381	else	381	else
382	array_type.sentinel,	382	array_type.sentinel,
383	}.toValue(),	383	}),
384	}, code, debug_output, reloc_info)) {	384	}, code, debug_output, reloc_info)) {
385	.ok => {},	385	.ok => {},
386	.fail => \|em\| return .{ .fail = em },	386	.fail => \|em\| return .{ .fail = em },
...	@@ -395,12 +395,12 @@ pub fn generateSymbol(	...	@@ -395,12 +395,12 @@ pub fn generateSymbol(
395	var index: u64 = 0;	395	var index: u64 = 0;
396	while (index < vector_type.len) : (index += 1) {	396	while (index < vector_type.len) : (index += 1) {
397	switch (try generateSymbol(bin_file, src_loc, .{	397	switch (try generateSymbol(bin_file, src_loc, .{
398	.ty = vector_type.child.toType(),	398	.ty = Type.fromInterned(vector_type.child),
399	.val = switch (aggregate.storage) {	399	.val = Value.fromInterned(switch (aggregate.storage) {
400	.bytes => unreachable,	400	.bytes => unreachable,
401	.elems => \|elems\| elems[@as(usize, @intCast(index))],	401	.elems => \|elems\| elems[@as(usize, @intCast(index))],
402	.repeated_elem => \|elem\| elem,	402	.repeated_elem => \|elem\| elem,
403	}.toValue(),	403	}),
404	}, code, debug_output, reloc_info)) {	404	}, code, debug_output, reloc_info)) {
405	.ok => {},	405	.ok => {},
406	.fail => \|em\| return .{ .fail = em },	406	.fail => \|em\| return .{ .fail = em },
...	@@ -410,7 +410,7 @@ pub fn generateSymbol(	...	@@ -410,7 +410,7 @@ pub fn generateSymbol(
410	}	410	}
411		411
412	const padding = math.cast(usize, typed_value.ty.abiSize(mod) -	412	const padding = math.cast(usize, typed_value.ty.abiSize(mod) -
413	(math.divCeil(u64, vector_type.child.toType().bitSize(mod) * vector_type.len, 8) catch \|err\| switch (err) {	413	(math.divCeil(u64, Type.fromInterned(vector_type.child).bitSize(mod) * vector_type.len, 8) catch \|err\| switch (err) {
414	error.DivisionByZero => unreachable,	414	error.DivisionByZero => unreachable,
415	else => \|e\| return e,	415	else => \|e\| return e,
416	})) orelse return error.Overflow;	416	})) orelse return error.Overflow;
...	@@ -424,7 +424,7 @@ pub fn generateSymbol(	...	@@ -424,7 +424,7 @@ pub fn generateSymbol(
424	0..,	424	0..,
425	) \|field_ty, comptime_val, index\| {	425	) \|field_ty, comptime_val, index\| {
426	if (comptime_val != .none) continue;	426	if (comptime_val != .none) continue;
427	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	427	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
428		428
429	const field_val = switch (aggregate.storage) {	429	const field_val = switch (aggregate.storage) {
430	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{	430	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{
...	@@ -436,8 +436,8 @@ pub fn generateSymbol(	...	@@ -436,8 +436,8 @@ pub fn generateSymbol(
436	};	436	};
437		437
438	switch (try generateSymbol(bin_file, src_loc, .{	438	switch (try generateSymbol(bin_file, src_loc, .{
439	.ty = field_ty.toType(),	439	.ty = Type.fromInterned(field_ty),
440	.val = field_val.toValue(),	440	.val = Value.fromInterned(field_val),
441	}, code, debug_output, reloc_info)) {	441	}, code, debug_output, reloc_info)) {
442	.ok => {},	442	.ok => {},
443	.fail => \|em\| return Result{ .fail = em },	443	.fail => \|em\| return Result{ .fail = em },
...	@@ -474,22 +474,22 @@ pub fn generateSymbol(	...	@@ -474,22 +474,22 @@ pub fn generateSymbol(
474		474
475	// pointer may point to a decl which must be marked used	475	// pointer may point to a decl which must be marked used
476	// but can also result in a relocation. Therefore we handle those separately.	476	// but can also result in a relocation. Therefore we handle those separately.
477	if (field_ty.toType().zigTypeTag(mod) == .Pointer) {	477	if (Type.fromInterned(field_ty).zigTypeTag(mod) == .Pointer) {
478	const field_size = math.cast(usize, field_ty.toType().abiSize(mod)) orelse	478	const field_size = math.cast(usize, Type.fromInterned(field_ty).abiSize(mod)) orelse
479	return error.Overflow;	479	return error.Overflow;
480	var tmp_list = try std.ArrayList(u8).initCapacity(code.allocator, field_size);	480	var tmp_list = try std.ArrayList(u8).initCapacity(code.allocator, field_size);
481	defer tmp_list.deinit();	481	defer tmp_list.deinit();
482	switch (try generateSymbol(bin_file, src_loc, .{	482	switch (try generateSymbol(bin_file, src_loc, .{
483	.ty = field_ty.toType(),	483	.ty = Type.fromInterned(field_ty),
484	.val = field_val.toValue(),	484	.val = Value.fromInterned(field_val),
485	}, &tmp_list, debug_output, reloc_info)) {	485	}, &tmp_list, debug_output, reloc_info)) {
486	.ok => @memcpy(code.items[current_pos..][0..tmp_list.items.len], tmp_list.items),	486	.ok => @memcpy(code.items[current_pos..][0..tmp_list.items.len], tmp_list.items),
487	.fail => \|em\| return Result{ .fail = em },	487	.fail => \|em\| return Result{ .fail = em },
488	}	488	}
489	} else {	489	} else {
490	field_val.toValue().writeToPackedMemory(field_ty.toType(), mod, code.items[current_pos..], bits) catch unreachable;	490	Value.fromInterned(field_val).writeToPackedMemory(Type.fromInterned(field_ty), mod, code.items[current_pos..], bits) catch unreachable;
491	}	491	}
492	bits += @as(u16, @intCast(field_ty.toType().bitSize(mod)));	492	bits += @as(u16, @intCast(Type.fromInterned(field_ty).bitSize(mod)));
493	}	493	}
494	},	494	},
495	.Auto, .Extern => {	495	.Auto, .Extern => {
...	@@ -500,7 +500,7 @@ pub fn generateSymbol(	...	@@ -500,7 +500,7 @@ pub fn generateSymbol(
500	var it = struct_type.iterateRuntimeOrder(ip);	500	var it = struct_type.iterateRuntimeOrder(ip);
501	while (it.next()) \|field_index\| {	501	while (it.next()) \|field_index\| {
502	const field_ty = field_types[field_index];	502	const field_ty = field_types[field_index];
503	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	503	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
504		504
505	const field_val = switch (ip.indexToKey(typed_value.val.toIntern()).aggregate.storage) {	505	const field_val = switch (ip.indexToKey(typed_value.val.toIntern()).aggregate.storage) {
506	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{	506	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{
...	@@ -518,8 +518,8 @@ pub fn generateSymbol(	...	@@ -518,8 +518,8 @@ pub fn generateSymbol(
518	if (padding > 0) try code.appendNTimes(0, padding);	518	if (padding > 0) try code.appendNTimes(0, padding);
519		519
520	switch (try generateSymbol(bin_file, src_loc, .{	520	switch (try generateSymbol(bin_file, src_loc, .{
521	.ty = field_ty.toType(),	521	.ty = Type.fromInterned(field_ty),
522	.val = field_val.toValue(),	522	.val = Value.fromInterned(field_val),
523	}, code, debug_output, reloc_info)) {	523	}, code, debug_output, reloc_info)) {
524	.ok => {},	524	.ok => {},
525	.fail => \|em\| return Result{ .fail = em },	525	.fail => \|em\| return Result{ .fail = em },
...	@@ -545,7 +545,7 @@ pub fn generateSymbol(	...	@@ -545,7 +545,7 @@ pub fn generateSymbol(
545	if (layout.payload_size == 0) {	545	if (layout.payload_size == 0) {
546	return generateSymbol(bin_file, src_loc, .{	546	return generateSymbol(bin_file, src_loc, .{
547	.ty = typed_value.ty.unionTagTypeSafety(mod).?,	547	.ty = typed_value.ty.unionTagTypeSafety(mod).?,
548	.val = un.tag.toValue(),	548	.val = Value.fromInterned(un.tag),
549	}, code, debug_output, reloc_info);	549	}, code, debug_output, reloc_info);
550	}	550	}
551		551
...	@@ -553,7 +553,7 @@ pub fn generateSymbol(	...	@@ -553,7 +553,7 @@ pub fn generateSymbol(
553	if (layout.tag_size > 0 and layout.tag_align.compare(.gte, layout.payload_align)) {	553	if (layout.tag_size > 0 and layout.tag_align.compare(.gte, layout.payload_align)) {
554	switch (try generateSymbol(bin_file, src_loc, .{	554	switch (try generateSymbol(bin_file, src_loc, .{
555	.ty = typed_value.ty.unionTagTypeSafety(mod).?,	555	.ty = typed_value.ty.unionTagTypeSafety(mod).?,
556	.val = un.tag.toValue(),	556	.val = Value.fromInterned(un.tag),
557	}, code, debug_output, reloc_info)) {	557	}, code, debug_output, reloc_info)) {
558	.ok => {},	558	.ok => {},
559	.fail => \|em\| return Result{ .fail = em },	559	.fail => \|em\| return Result{ .fail = em },
...	@@ -562,14 +562,14 @@ pub fn generateSymbol(	...	@@ -562,14 +562,14 @@ pub fn generateSymbol(
562		562
563	const union_obj = mod.typeToUnion(typed_value.ty).?;	563	const union_obj = mod.typeToUnion(typed_value.ty).?;
564	if (un.tag != .none) {	564	if (un.tag != .none) {
565	const field_index = typed_value.ty.unionTagFieldIndex(un.tag.toValue(), mod).?;	565	const field_index = typed_value.ty.unionTagFieldIndex(Value.fromInterned(un.tag), mod).?;
566	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	566	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
567	if (!field_ty.hasRuntimeBits(mod)) {	567	if (!field_ty.hasRuntimeBits(mod)) {
568	try code.appendNTimes(0xaa, math.cast(usize, layout.payload_size) orelse return error.Overflow);	568	try code.appendNTimes(0xaa, math.cast(usize, layout.payload_size) orelse return error.Overflow);
569	} else {	569	} else {
570	switch (try generateSymbol(bin_file, src_loc, .{	570	switch (try generateSymbol(bin_file, src_loc, .{
571	.ty = field_ty,	571	.ty = field_ty,
572	.val = un.val.toValue(),	572	.val = Value.fromInterned(un.val),
573	}, code, debug_output, reloc_info)) {	573	}, code, debug_output, reloc_info)) {
574	.ok => {},	574	.ok => {},
575	.fail => \|em\| return Result{ .fail = em },	575	.fail => \|em\| return Result{ .fail = em },
...	@@ -582,8 +582,8 @@ pub fn generateSymbol(	...	@@ -582,8 +582,8 @@ pub fn generateSymbol(
582	}	582	}
583	} else {	583	} else {
584	switch (try generateSymbol(bin_file, src_loc, .{	584	switch (try generateSymbol(bin_file, src_loc, .{
585	.ty = ip.typeOf(un.val).toType(),	585	.ty = Type.fromInterned(ip.typeOf(un.val)),
586	.val = un.val.toValue(),	586	.val = Value.fromInterned(un.val),
587	}, code, debug_output, reloc_info)) {	587	}, code, debug_output, reloc_info)) {
588	.ok => {},	588	.ok => {},
589	.fail => \|em\| return Result{ .fail = em },	589	.fail => \|em\| return Result{ .fail = em },
...	@@ -592,8 +592,8 @@ pub fn generateSymbol(	...	@@ -592,8 +592,8 @@ pub fn generateSymbol(
592		592
593	if (layout.tag_size > 0 and layout.tag_align.compare(.lt, layout.payload_align)) {	593	if (layout.tag_size > 0 and layout.tag_align.compare(.lt, layout.payload_align)) {
594	switch (try generateSymbol(bin_file, src_loc, .{	594	switch (try generateSymbol(bin_file, src_loc, .{
595	.ty = union_obj.enum_tag_ty.toType(),	595	.ty = Type.fromInterned(union_obj.enum_tag_ty),
596	.val = un.tag.toValue(),	596	.val = Value.fromInterned(un.tag),
597	}, code, debug_output, reloc_info)) {	597	}, code, debug_output, reloc_info)) {
598	.ok => {},	598	.ok => {},
599	.fail => \|em\| return Result{ .fail = em },	599	.fail => \|em\| return Result{ .fail = em },
...	@@ -626,7 +626,7 @@ fn lowerParentPtr(	...	@@ -626,7 +626,7 @@ fn lowerParentPtr(
626	.anon_decl => \|ad\| try lowerAnonDeclRef(bin_file, src_loc, ad, code, debug_output, reloc_info),	626	.anon_decl => \|ad\| try lowerAnonDeclRef(bin_file, src_loc, ad, code, debug_output, reloc_info),
627	.int => \|int\| try generateSymbol(bin_file, src_loc, .{	627	.int => \|int\| try generateSymbol(bin_file, src_loc, .{
628	.ty = Type.usize,	628	.ty = Type.usize,
629	.val = int.toValue(),	629	.val = Value.fromInterned(int),
630	}, code, debug_output, reloc_info),	630	}, code, debug_output, reloc_info),
631	.eu_payload => \|eu_payload\| try lowerParentPtr(	631	.eu_payload => \|eu_payload\| try lowerParentPtr(
632	bin_file,	632	bin_file,
...	@@ -635,7 +635,7 @@ fn lowerParentPtr(	...	@@ -635,7 +635,7 @@ fn lowerParentPtr(
635	code,	635	code,
636	debug_output,	636	debug_output,
637	reloc_info.offset(@as(u32, @intCast(errUnionPayloadOffset(	637	reloc_info.offset(@as(u32, @intCast(errUnionPayloadOffset(
638	mod.intern_pool.typeOf(eu_payload).toType(),	638	Type.fromInterned(mod.intern_pool.typeOf(eu_payload)),
639	mod,	639	mod,
640	)))),	640	)))),
641	),	641	),
...	@@ -654,7 +654,7 @@ fn lowerParentPtr(	...	@@ -654,7 +654,7 @@ fn lowerParentPtr(
654	code,	654	code,
655	debug_output,	655	debug_output,
656	reloc_info.offset(@as(u32, @intCast(elem.index *	656	reloc_info.offset(@as(u32, @intCast(elem.index *
657	mod.intern_pool.typeOf(elem.base).toType().elemType2(mod).abiSize(mod)))),	657	Type.fromInterned(mod.intern_pool.typeOf(elem.base)).elemType2(mod).abiSize(mod)))),
658	),	658	),
659	.field => \|field\| {	659	.field => \|field\| {
660	const base_type = mod.intern_pool.indexToKey(mod.intern_pool.typeOf(field.base)).ptr_type.child;	660	const base_type = mod.intern_pool.indexToKey(mod.intern_pool.typeOf(field.base)).ptr_type.child;
...	@@ -676,12 +676,12 @@ fn lowerParentPtr(	...	@@ -676,12 +676,12 @@ fn lowerParentPtr(
676	.struct_type,	676	.struct_type,
677	.anon_struct_type,	677	.anon_struct_type,
678	.union_type,	678	.union_type,
679	=> switch (base_type.toType().containerLayout(mod)) {	679	=> switch (Type.fromInterned(base_type).containerLayout(mod)) {
680	.Auto, .Extern => @intCast(base_type.toType().structFieldOffset(	680	.Auto, .Extern => @intCast(Type.fromInterned(base_type).structFieldOffset(
681	@intCast(field.index),	681	@intCast(field.index),
682	mod,	682	mod,
683	)),	683	)),
684	.Packed => if (mod.typeToStruct(base_type.toType())) \|struct_type\|	684	.Packed => if (mod.typeToStruct(Type.fromInterned(base_type))) \|struct_type\|
685	math.divExact(u16, mod.structPackedFieldBitOffset(	685	math.divExact(u16, mod.structPackedFieldBitOffset(
686	struct_type,	686	struct_type,
687	@intCast(field.index),	687	@intCast(field.index),
...	@@ -723,7 +723,7 @@ fn lowerAnonDeclRef(	...	@@ -723,7 +723,7 @@ fn lowerAnonDeclRef(
723		723
724	const ptr_width_bytes = @divExact(target.ptrBitWidth(), 8);	724	const ptr_width_bytes = @divExact(target.ptrBitWidth(), 8);
725	const decl_val = anon_decl.val;	725	const decl_val = anon_decl.val;
726	const decl_ty = mod.intern_pool.typeOf(decl_val).toType();	726	const decl_ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
727	log.debug("lowerAnonDecl: ty = {}", .{decl_ty.fmt(mod)});	727	log.debug("lowerAnonDecl: ty = {}", .{decl_ty.fmt(mod)});
728	const is_fn_body = decl_ty.zigTypeTag(mod) == .Fn;	728	const is_fn_body = decl_ty.zigTypeTag(mod) == .Fn;
729	if (!is_fn_body and !decl_ty.hasRuntimeBits(mod)) {	729	if (!is_fn_body and !decl_ty.hasRuntimeBits(mod)) {
...	@@ -1056,8 +1056,8 @@ pub fn genTypedValue(	...	@@ -1056,8 +1056,8 @@ pub fn genTypedValue(
1056	const enum_tag = mod.intern_pool.indexToKey(typed_value.val.toIntern()).enum_tag;	1056	const enum_tag = mod.intern_pool.indexToKey(typed_value.val.toIntern()).enum_tag;
1057	const int_tag_ty = mod.intern_pool.typeOf(enum_tag.int);	1057	const int_tag_ty = mod.intern_pool.typeOf(enum_tag.int);
1058	return genTypedValue(bin_file, src_loc, .{	1058	return genTypedValue(bin_file, src_loc, .{
1059	.ty = int_tag_ty.toType(),	1059	.ty = Type.fromInterned(int_tag_ty),
1060	.val = enum_tag.int.toValue(),	1060	.val = Value.fromInterned(enum_tag.int),
1061	}, owner_decl_index);	1061	}, owner_decl_index);
1062	},	1062	},
1063	.ErrorSet => {	1063	.ErrorSet => {
...	@@ -1074,10 +1074,10 @@ pub fn genTypedValue(	...	@@ -1074,10 +1074,10 @@ pub fn genTypedValue(
1074	switch (mod.intern_pool.indexToKey(typed_value.val.toIntern()).error_union.val) {	1074	switch (mod.intern_pool.indexToKey(typed_value.val.toIntern()).error_union.val) {
1075	.err_name => \|err_name\| return genTypedValue(bin_file, src_loc, .{	1075	.err_name => \|err_name\| return genTypedValue(bin_file, src_loc, .{
1076	.ty = err_type,	1076	.ty = err_type,
1077	.val = (try mod.intern(.{ .err = .{	1077	.val = Value.fromInterned((try mod.intern(.{ .err = .{
1078	.ty = err_type.toIntern(),	1078	.ty = err_type.toIntern(),
1079	.name = err_name,	1079	.name = err_name,
1080	} })).toValue(),	1080	} }))),
1081	}, owner_decl_index),	1081	}, owner_decl_index),
1082	.payload => return genTypedValue(bin_file, src_loc, .{	1082	.payload => return genTypedValue(bin_file, src_loc, .{
1083	.ty = err_int_ty,	1083	.ty = err_int_ty,

src/codegen/c.zig+71-71

...	@@ -355,8 +355,8 @@ pub const Function = struct {	...	@@ -355,8 +355,8 @@ pub const Function = struct {
355	switch (c_value) {	355	switch (c_value) {
356	.constant => \|val\| try f.object.dg.renderValue(	356	.constant => \|val\| try f.object.dg.renderValue(
357	w,	357	w,
358	f.object.dg.module.intern_pool.typeOf(val).toType(),	358	Type.fromInterned(f.object.dg.module.intern_pool.typeOf(val)),
359	val.toValue(),	359	Value.fromInterned(val),
360	location,	360	location,
361	),	361	),
362	.undef => \|ty\| try f.object.dg.renderValue(w, ty, Value.undef, location),	362	.undef => \|ty\| try f.object.dg.renderValue(w, ty, Value.undef, location),
...	@@ -370,8 +370,8 @@ pub const Function = struct {	...	@@ -370,8 +370,8 @@ pub const Function = struct {
370	try w.writeAll("(*");	370	try w.writeAll("(*");
371	try f.object.dg.renderValue(	371	try f.object.dg.renderValue(
372	w,	372	w,
373	f.object.dg.module.intern_pool.typeOf(val).toType(),	373	Type.fromInterned(f.object.dg.module.intern_pool.typeOf(val)),
374	val.toValue(),	374	Value.fromInterned(val),
375	.Other,	375	.Other,
376	);	376	);
377	try w.writeByte(')');	377	try w.writeByte(')');
...	@@ -385,8 +385,8 @@ pub const Function = struct {	...	@@ -385,8 +385,8 @@ pub const Function = struct {
385	.constant => \|val\| {	385	.constant => \|val\| {
386	try f.object.dg.renderValue(	386	try f.object.dg.renderValue(
387	w,	387	w,
388	f.object.dg.module.intern_pool.typeOf(val).toType(),	388	Type.fromInterned(f.object.dg.module.intern_pool.typeOf(val)),
389	val.toValue(),	389	Value.fromInterned(val),
390	.Other,	390	.Other,
391	);	391	);
392	try w.writeByte('.');	392	try w.writeByte('.');
...	@@ -402,8 +402,8 @@ pub const Function = struct {	...	@@ -402,8 +402,8 @@ pub const Function = struct {
402	try w.writeByte('(');	402	try w.writeByte('(');
403	try f.object.dg.renderValue(	403	try f.object.dg.renderValue(
404	w,	404	w,
405	f.object.dg.module.intern_pool.typeOf(val).toType(),	405	Type.fromInterned(f.object.dg.module.intern_pool.typeOf(val)),
406	val.toValue(),	406	Value.fromInterned(val),
407	.Other,	407	.Other,
408	);	408	);
409	try w.writeAll(")->");	409	try w.writeAll(")->");
...	@@ -561,7 +561,7 @@ pub const DeclGen = struct {	...	@@ -561,7 +561,7 @@ pub const DeclGen = struct {
561	const mod = dg.module;	561	const mod = dg.module;
562	const ip = &mod.intern_pool;	562	const ip = &mod.intern_pool;
563	const decl_val = anon_decl.val;	563	const decl_val = anon_decl.val;
564	const decl_ty = ip.typeOf(decl_val).toType();	564	const decl_ty = Type.fromInterned(ip.typeOf(decl_val));
565		565
566	// Render an undefined pointer if we have a pointer to a zero-bit or comptime type.	566	// Render an undefined pointer if we have a pointer to a zero-bit or comptime type.
567	if (ty.isPtrAtRuntime(mod) and !decl_ty.isFnOrHasRuntimeBits(mod)) {	567	if (ty.isPtrAtRuntime(mod) and !decl_ty.isFnOrHasRuntimeBits(mod)) {
...	@@ -569,20 +569,20 @@ pub const DeclGen = struct {	...	@@ -569,20 +569,20 @@ pub const DeclGen = struct {
569	}	569	}
570		570
571	// Chase function values in order to be able to reference the original function.	571	// Chase function values in order to be able to reference the original function.
572	if (decl_val.toValue().getFunction(mod)) \|func\| {	572	if (Value.fromInterned(decl_val).getFunction(mod)) \|func\| {
573	_ = func;	573	_ = func;
574	_ = ptr_val;	574	_ = ptr_val;
575	_ = location;	575	_ = location;
576	@panic("TODO");	576	@panic("TODO");
577	}	577	}
578	if (decl_val.toValue().getExternFunc(mod)) \|extern_func\| {	578	if (Value.fromInterned(decl_val).getExternFunc(mod)) \|extern_func\| {
579	_ = extern_func;	579	_ = extern_func;
580	_ = ptr_val;	580	_ = ptr_val;
581	_ = location;	581	_ = location;
582	@panic("TODO");	582	@panic("TODO");
583	}	583	}
584		584
585	assert(decl_val.toValue().getVariable(mod) == null);	585	assert(Value.fromInterned(decl_val).getVariable(mod) == null);
586		586
587	// We shouldn't cast C function pointers as this is UB (when you call	587	// We shouldn't cast C function pointers as this is UB (when you call
588	// them). The analysis until now should ensure that the C function	588	// them). The analysis until now should ensure that the C function
...	@@ -608,7 +608,7 @@ pub const DeclGen = struct {	...	@@ -608,7 +608,7 @@ pub const DeclGen = struct {
608	// alignment. If there is already an entry, keep the greater alignment.	608	// alignment. If there is already an entry, keep the greater alignment.
609	const explicit_alignment = ptr_type.flags.alignment;	609	const explicit_alignment = ptr_type.flags.alignment;
610	if (explicit_alignment != .none) {	610	if (explicit_alignment != .none) {
611	const abi_alignment = ptr_type.child.toType().abiAlignment(mod);	611	const abi_alignment = Type.fromInterned(ptr_type.child).abiAlignment(mod);
612	if (explicit_alignment.compareStrict(.gt, abi_alignment)) {	612	if (explicit_alignment.compareStrict(.gt, abi_alignment)) {
613	const aligned_gop = try dg.aligned_anon_decls.getOrPut(dg.gpa, decl_val);	613	const aligned_gop = try dg.aligned_anon_decls.getOrPut(dg.gpa, decl_val);
614	aligned_gop.value_ptr.* = if (aligned_gop.found_existing)	614	aligned_gop.value_ptr.* = if (aligned_gop.found_existing)
...	@@ -668,20 +668,20 @@ pub const DeclGen = struct {	...	@@ -668,20 +668,20 @@ pub const DeclGen = struct {
668	location: ValueRenderLocation,	668	location: ValueRenderLocation,
669	) error{ OutOfMemory, AnalysisFail }!void {	669	) error{ OutOfMemory, AnalysisFail }!void {
670	const mod = dg.module;	670	const mod = dg.module;
671	const ptr_ty = mod.intern_pool.typeOf(ptr_val).toType();	671	const ptr_ty = Type.fromInterned(mod.intern_pool.typeOf(ptr_val));
672	const ptr_cty = try dg.typeToIndex(ptr_ty, .complete);	672	const ptr_cty = try dg.typeToIndex(ptr_ty, .complete);
673	const ptr = mod.intern_pool.indexToKey(ptr_val).ptr;	673	const ptr = mod.intern_pool.indexToKey(ptr_val).ptr;
674	switch (ptr.addr) {	674	switch (ptr.addr) {
675	.decl => \|d\| try dg.renderDeclValue(writer, ptr_ty, ptr_val.toValue(), d, location),	675	.decl => \|d\| try dg.renderDeclValue(writer, ptr_ty, Value.fromInterned(ptr_val), d, location),
676	.mut_decl => \|md\| try dg.renderDeclValue(writer, ptr_ty, ptr_val.toValue(), md.decl, location),	676	.mut_decl => \|md\| try dg.renderDeclValue(writer, ptr_ty, Value.fromInterned(ptr_val), md.decl, location),
677	.anon_decl => \|anon_decl\| try dg.renderAnonDeclValue(writer, ptr_ty, ptr_val.toValue(), anon_decl, location),	677	.anon_decl => \|anon_decl\| try dg.renderAnonDeclValue(writer, ptr_ty, Value.fromInterned(ptr_val), anon_decl, location),
678	.int => \|int\| {	678	.int => \|int\| {
679	try writer.writeByte('(');	679	try writer.writeByte('(');
680	try dg.renderCType(writer, ptr_cty);	680	try dg.renderCType(writer, ptr_cty);
681	try writer.print("){x}", .{try dg.fmtIntLiteral(Type.usize, int.toValue(), .Other)});	681	try writer.print("){x}", .{try dg.fmtIntLiteral(Type.usize, Value.fromInterned(int), .Other)});
682	},	682	},
683	.eu_payload, .opt_payload => \|base\| {	683	.eu_payload, .opt_payload => \|base\| {
684	const ptr_base_ty = mod.intern_pool.typeOf(base).toType();	684	const ptr_base_ty = Type.fromInterned(mod.intern_pool.typeOf(base));
685	const base_ty = ptr_base_ty.childType(mod);	685	const base_ty = ptr_base_ty.childType(mod);
686	// Ensure complete type definition is visible before accessing fields.	686	// Ensure complete type definition is visible before accessing fields.
687	_ = try dg.typeToIndex(base_ty, .complete);	687	_ = try dg.typeToIndex(base_ty, .complete);
...	@@ -702,7 +702,7 @@ pub const DeclGen = struct {	...	@@ -702,7 +702,7 @@ pub const DeclGen = struct {
702	try writer.writeAll(")->payload");	702	try writer.writeAll(")->payload");
703	},	703	},
704	.elem => \|elem\| {	704	.elem => \|elem\| {
705	const ptr_base_ty = mod.intern_pool.typeOf(elem.base).toType();	705	const ptr_base_ty = Type.fromInterned(mod.intern_pool.typeOf(elem.base));
706	const elem_ty = ptr_base_ty.elemType2(mod);	706	const elem_ty = ptr_base_ty.elemType2(mod);
707	const ptr_elem_ty = try mod.adjustPtrTypeChild(ptr_base_ty, elem_ty);	707	const ptr_elem_ty = try mod.adjustPtrTypeChild(ptr_base_ty, elem_ty);
708	const ptr_elem_cty = try dg.typeToIndex(ptr_elem_ty, .complete);	708	const ptr_elem_cty = try dg.typeToIndex(ptr_elem_ty, .complete);
...	@@ -718,7 +718,7 @@ pub const DeclGen = struct {	...	@@ -718,7 +718,7 @@ pub const DeclGen = struct {
718	try writer.print(")[{d}]", .{elem.index});	718	try writer.print(")[{d}]", .{elem.index});
719	},	719	},
720	.field => \|field\| {	720	.field => \|field\| {
721	const ptr_base_ty = mod.intern_pool.typeOf(field.base).toType();	721	const ptr_base_ty = Type.fromInterned(mod.intern_pool.typeOf(field.base));
722	const base_ty = ptr_base_ty.childType(mod);	722	const base_ty = ptr_base_ty.childType(mod);
723	// Ensure complete type definition is visible before accessing fields.	723	// Ensure complete type definition is visible before accessing fields.
724	_ = try dg.typeToIndex(base_ty, .complete);	724	_ = try dg.typeToIndex(base_ty, .complete);
...	@@ -909,8 +909,8 @@ pub const DeclGen = struct {	...	@@ -909,8 +909,8 @@ pub const DeclGen = struct {
909	}	909	}
910	const union_obj = mod.typeToUnion(ty).?;	910	const union_obj = mod.typeToUnion(ty).?;
911	for (union_obj.field_types.get(ip)) \|field_ty\| {	911	for (union_obj.field_types.get(ip)) \|field_ty\| {
912	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	912	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
913	try dg.renderValue(writer, field_ty.toType(), val, initializer_type);	913	try dg.renderValue(writer, Type.fromInterned(field_ty), val, initializer_type);
914	break;	914	break;
915	}	915	}
916	if (ty.unionTagTypeSafety(mod)) \|_\| try writer.writeByte('}');	916	if (ty.unionTagTypeSafety(mod)) \|_\| try writer.writeByte('}');
...	@@ -1045,10 +1045,10 @@ pub const DeclGen = struct {	...	@@ -1045,10 +1045,10 @@ pub const DeclGen = struct {
1045	.err_name => \|err_name\| return dg.renderValue(	1045	.err_name => \|err_name\| return dg.renderValue(
1046	writer,	1046	writer,
1047	error_ty,	1047	error_ty,
1048	(try mod.intern(.{ .err = .{	1048	Value.fromInterned((try mod.intern(.{ .err = .{
1049	.ty = error_ty.toIntern(),	1049	.ty = error_ty.toIntern(),
1050	.name = err_name,	1050	.name = err_name,
1051	} })).toValue(),	1051	} }))),
1052	location,	1052	location,
1053	),	1053	),
1054	.payload => return dg.renderValue(	1054	.payload => return dg.renderValue(
...	@@ -1070,10 +1070,10 @@ pub const DeclGen = struct {	...	@@ -1070,10 +1070,10 @@ pub const DeclGen = struct {
1070	try dg.renderValue(	1070	try dg.renderValue(
1071	writer,	1071	writer,
1072	payload_ty,	1072	payload_ty,
1073	switch (error_union.val) {	1073	Value.fromInterned(switch (error_union.val) {
1074	.err_name => try mod.intern(.{ .undef = payload_ty.ip_index }),	1074	.err_name => try mod.intern(.{ .undef = payload_ty.ip_index }),
1075	.payload => \|payload\| payload,	1075	.payload => \|payload\| payload,
1076	}.toValue(),	1076	}),
1077	initializer_type,	1077	initializer_type,
1078	);	1078	);
1079	try writer.writeAll(", .error = ");	1079	try writer.writeAll(", .error = ");
...	@@ -1081,10 +1081,10 @@ pub const DeclGen = struct {	...	@@ -1081,10 +1081,10 @@ pub const DeclGen = struct {
1081	.err_name => \|err_name\| try dg.renderValue(	1081	.err_name => \|err_name\| try dg.renderValue(
1082	writer,	1082	writer,
1083	error_ty,	1083	error_ty,
1084	(try mod.intern(.{ .err = .{	1084	Value.fromInterned((try mod.intern(.{ .err = .{
1085	.ty = error_ty.toIntern(),	1085	.ty = error_ty.toIntern(),
1086	.name = err_name,	1086	.name = err_name,
1087	} })).toValue(),	1087	} }))),
1088	location,	1088	location,
1089	),	1089	),
1090	.payload => try dg.renderValue(	1090	.payload => try dg.renderValue(
...	@@ -1099,7 +1099,7 @@ pub const DeclGen = struct {	...	@@ -1099,7 +1099,7 @@ pub const DeclGen = struct {
1099	.enum_tag => {	1099	.enum_tag => {
1100	const enum_tag = ip.indexToKey(val.ip_index).enum_tag;	1100	const enum_tag = ip.indexToKey(val.ip_index).enum_tag;
1101	const int_tag_ty = ip.typeOf(enum_tag.int);	1101	const int_tag_ty = ip.typeOf(enum_tag.int);
1102	try dg.renderValue(writer, int_tag_ty.toType(), enum_tag.int.toValue(), location);	1102	try dg.renderValue(writer, Type.fromInterned(int_tag_ty), Value.fromInterned(enum_tag.int), location);
1103	},	1103	},
1104	.float => {	1104	.float => {
1105	const bits = ty.floatBits(target);	1105	const bits = ty.floatBits(target);
...	@@ -1218,7 +1218,7 @@ pub const DeclGen = struct {	...	@@ -1218,7 +1218,7 @@ pub const DeclGen = struct {
1218	try writer.writeAll("((");	1218	try writer.writeAll("((");
1219	try dg.renderType(writer, ptr_ty);	1219	try dg.renderType(writer, ptr_ty);
1220	try writer.print("){x})", .{	1220	try writer.print("){x})", .{
1221	try dg.fmtIntLiteral(Type.usize, int.toValue(), ptr_location),	1221	try dg.fmtIntLiteral(Type.usize, Value.fromInterned(int), ptr_location),
1222	});	1222	});
1223	},	1223	},
1224	.eu_payload,	1224	.eu_payload,
...	@@ -1230,7 +1230,7 @@ pub const DeclGen = struct {	...	@@ -1230,7 +1230,7 @@ pub const DeclGen = struct {
1230	}	1230	}
1231	if (ptr.len != .none) {	1231	if (ptr.len != .none) {
1232	try writer.writeAll(", ");	1232	try writer.writeAll(", ");
1233	try dg.renderValue(writer, Type.usize, ptr.len.toValue(), initializer_type);	1233	try dg.renderValue(writer, Type.usize, Value.fromInterned(ptr.len), initializer_type);
1234	try writer.writeByte('}');	1234	try writer.writeByte('}');
1235	}	1235	}
1236	},	1236	},
...	@@ -1250,7 +1250,7 @@ pub const DeclGen = struct {	...	@@ -1250,7 +1250,7 @@ pub const DeclGen = struct {
1250	.Pointer => try mod.getCoerced(val, payload_ty),	1250	.Pointer => try mod.getCoerced(val, payload_ty),
1251	else => unreachable,	1251	else => unreachable,
1252	},	1252	},
1253	else => \|payload\| payload.toValue(),	1253	else => \|payload\| Value.fromInterned(payload),
1254	},	1254	},
1255	location,	1255	location,
1256	);	1256	);
...	@@ -1262,10 +1262,10 @@ pub const DeclGen = struct {	...	@@ -1262,10 +1262,10 @@ pub const DeclGen = struct {
1262	}	1262	}
1263		1263
1264	try writer.writeAll("{ .payload = ");	1264	try writer.writeAll("{ .payload = ");
1265	try dg.renderValue(writer, payload_ty, switch (opt.val) {	1265	try dg.renderValue(writer, payload_ty, Value.fromInterned(switch (opt.val) {
1266	.none => try mod.intern(.{ .undef = payload_ty.ip_index }),	1266	.none => try mod.intern(.{ .undef = payload_ty.ip_index }),
1267	else => \|payload\| payload,	1267	else => \|payload\| payload,
1268	}.toValue(), initializer_type);	1268	}), initializer_type);
1269	try writer.writeAll(", .is_null = ");	1269	try writer.writeAll(", .is_null = ");
1270	try dg.renderValue(writer, Type.bool, is_null_val, initializer_type);	1270	try dg.renderValue(writer, Type.bool, is_null_val, initializer_type);
1271	try writer.writeAll(" }");	1271	try writer.writeAll(" }");
...	@@ -1349,7 +1349,7 @@ pub const DeclGen = struct {	...	@@ -1349,7 +1349,7 @@ pub const DeclGen = struct {
1349	0..,	1349	0..,
1350	) \|field_ty, comptime_ty, field_i\| {	1350	) \|field_ty, comptime_ty, field_i\| {
1351	if (comptime_ty != .none) continue;	1351	if (comptime_ty != .none) continue;
1352	if (!field_ty.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	1352	if (!Type.fromInterned(field_ty).hasRuntimeBitsIgnoreComptime(mod)) continue;
1353		1353
1354	if (!empty) try writer.writeByte(',');	1354	if (!empty) try writer.writeByte(',');
1355		1355
...	@@ -1361,7 +1361,7 @@ pub const DeclGen = struct {	...	@@ -1361,7 +1361,7 @@ pub const DeclGen = struct {
1361	.elems => \|elems\| elems[field_i],	1361	.elems => \|elems\| elems[field_i],
1362	.repeated_elem => \|elem\| elem,	1362	.repeated_elem => \|elem\| elem,
1363	};	1363	};
1364	try dg.renderValue(writer, field_ty.toType(), field_val.toValue(), initializer_type);	1364	try dg.renderValue(writer, Type.fromInterned(field_ty), Value.fromInterned(field_val), initializer_type);
1365		1365
1366	empty = false;	1366	empty = false;
1367	}	1367	}
...	@@ -1378,7 +1378,7 @@ pub const DeclGen = struct {	...	@@ -1378,7 +1378,7 @@ pub const DeclGen = struct {
1378	try writer.writeByte('{');	1378	try writer.writeByte('{');
1379	var empty = true;	1379	var empty = true;
1380	for (0..struct_type.field_types.len) \|field_i\| {	1380	for (0..struct_type.field_types.len) \|field_i\| {
1381	const field_ty = struct_type.field_types.get(ip)[field_i].toType();	1381	const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_i]);
1382	if (struct_type.fieldIsComptime(ip, field_i)) continue;	1382	if (struct_type.fieldIsComptime(ip, field_i)) continue;
1383	if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;	1383	if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
1384		1384
...	@@ -1391,7 +1391,7 @@ pub const DeclGen = struct {	...	@@ -1391,7 +1391,7 @@ pub const DeclGen = struct {
1391	.elems => \|elems\| elems[field_i],	1391	.elems => \|elems\| elems[field_i],
1392	.repeated_elem => \|elem\| elem,	1392	.repeated_elem => \|elem\| elem,
1393	};	1393	};
1394	try dg.renderValue(writer, field_ty, field_val.toValue(), initializer_type);	1394	try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), initializer_type);
1395		1395
1396	empty = false;	1396	empty = false;
1397	}	1397	}
...	@@ -1408,7 +1408,7 @@ pub const DeclGen = struct {	...	@@ -1408,7 +1408,7 @@ pub const DeclGen = struct {
1408	var eff_num_fields: usize = 0;	1408	var eff_num_fields: usize = 0;
1409		1409
1410	for (field_types) \|field_ty\| {	1410	for (field_types) \|field_ty\| {
1411	if (!field_ty.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	1411	if (!Type.fromInterned(field_ty).hasRuntimeBitsIgnoreComptime(mod)) continue;
1412	eff_num_fields += 1;	1412	eff_num_fields += 1;
1413	}	1413	}
1414		1414
...	@@ -1428,7 +1428,7 @@ pub const DeclGen = struct {	...	@@ -1428,7 +1428,7 @@ pub const DeclGen = struct {
1428	var eff_index: usize = 0;	1428	var eff_index: usize = 0;
1429	var needs_closing_paren = false;	1429	var needs_closing_paren = false;
1430	for (field_types, 0..) \|field_ty, field_i\| {	1430	for (field_types, 0..) \|field_ty, field_i\| {
1431	if (!field_ty.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	1431	if (!Type.fromInterned(field_ty).hasRuntimeBitsIgnoreComptime(mod)) continue;
1432		1432
1433	const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {	1433	const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
1434	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{	1434	.bytes => \|bytes\| try ip.get(mod.gpa, .{ .int = .{
...	@@ -1438,24 +1438,24 @@ pub const DeclGen = struct {	...	@@ -1438,24 +1438,24 @@ pub const DeclGen = struct {
1438	.elems => \|elems\| elems[field_i],	1438	.elems => \|elems\| elems[field_i],
1439	.repeated_elem => \|elem\| elem,	1439	.repeated_elem => \|elem\| elem,
1440	};	1440	};
1441	const cast_context = IntCastContext{ .value = .{ .value = field_val.toValue() } };	1441	const cast_context = IntCastContext{ .value = .{ .value = Value.fromInterned(field_val) } };
1442	if (bit_offset != 0) {	1442	if (bit_offset != 0) {
1443	try writer.writeAll("zig_shl_");	1443	try writer.writeAll("zig_shl_");
1444	try dg.renderTypeForBuiltinFnName(writer, ty);	1444	try dg.renderTypeForBuiltinFnName(writer, ty);
1445	try writer.writeByte('(');	1445	try writer.writeByte('(');
1446	try dg.renderIntCast(writer, ty, cast_context, field_ty.toType(), .FunctionArgument);	1446	try dg.renderIntCast(writer, ty, cast_context, Type.fromInterned(field_ty), .FunctionArgument);
1447	try writer.writeAll(", ");	1447	try writer.writeAll(", ");
1448	const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);	1448	const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1449	try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);	1449	try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1450	try writer.writeByte(')');	1450	try writer.writeByte(')');
1451	} else {	1451	} else {
1452	try dg.renderIntCast(writer, ty, cast_context, field_ty.toType(), .FunctionArgument);	1452	try dg.renderIntCast(writer, ty, cast_context, Type.fromInterned(field_ty), .FunctionArgument);
1453	}	1453	}
1454		1454
1455	if (needs_closing_paren) try writer.writeByte(')');	1455	if (needs_closing_paren) try writer.writeByte(')');
1456	if (eff_index != eff_num_fields - 1) try writer.writeAll(", ");	1456	if (eff_index != eff_num_fields - 1) try writer.writeAll(", ");
1457		1457
1458	bit_offset += field_ty.toType().bitSize(mod);	1458	bit_offset += Type.fromInterned(field_ty).bitSize(mod);
1459	needs_closing_paren = true;	1459	needs_closing_paren = true;
1460	eff_index += 1;	1460	eff_index += 1;
1461	}	1461	}
...	@@ -1464,7 +1464,7 @@ pub const DeclGen = struct {	...	@@ -1464,7 +1464,7 @@ pub const DeclGen = struct {
1464	// a << a_off \| b << b_off \| c << c_off	1464	// a << a_off \| b << b_off \| c << c_off
1465	var empty = true;	1465	var empty = true;
1466	for (field_types, 0..) \|field_ty, field_i\| {	1466	for (field_types, 0..) \|field_ty, field_i\| {
1467	if (!field_ty.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	1467	if (!Type.fromInterned(field_ty).hasRuntimeBitsIgnoreComptime(mod)) continue;
1468		1468
1469	if (!empty) try writer.writeAll(" \| ");	1469	if (!empty) try writer.writeAll(" \| ");
1470	try writer.writeByte('(');	1470	try writer.writeByte('(');
...	@@ -1481,15 +1481,15 @@ pub const DeclGen = struct {	...	@@ -1481,15 +1481,15 @@ pub const DeclGen = struct {
1481	};	1481	};
1482		1482
1483	if (bit_offset != 0) {	1483	if (bit_offset != 0) {
1484	try dg.renderValue(writer, field_ty.toType(), field_val.toValue(), .Other);	1484	try dg.renderValue(writer, Type.fromInterned(field_ty), Value.fromInterned(field_val), .Other);
1485	try writer.writeAll(" << ");	1485	try writer.writeAll(" << ");
1486	const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);	1486	const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1487	try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);	1487	try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1488	} else {	1488	} else {
1489	try dg.renderValue(writer, field_ty.toType(), field_val.toValue(), .Other);	1489	try dg.renderValue(writer, Type.fromInterned(field_ty), Value.fromInterned(field_val), .Other);
1490	}	1490	}
1491		1491
1492	bit_offset += field_ty.toType().bitSize(mod);	1492	bit_offset += Type.fromInterned(field_ty).bitSize(mod);
1493	empty = false;	1493	empty = false;
1494	}	1494	}
1495	try writer.writeByte(')');	1495	try writer.writeByte(')');
...	@@ -1509,7 +1509,7 @@ pub const DeclGen = struct {	...	@@ -1509,7 +1509,7 @@ pub const DeclGen = struct {
1509	try dg.renderType(writer, backing_ty);	1509	try dg.renderType(writer, backing_ty);
1510	try writer.writeByte(')');	1510	try writer.writeByte(')');
1511	}	1511	}
1512	try dg.renderValue(writer, backing_ty, un.val.toValue(), initializer_type);	1512	try dg.renderValue(writer, backing_ty, Value.fromInterned(un.val), initializer_type);
1513	},	1513	},
1514	.Extern => {	1514	.Extern => {
1515	if (location == .StaticInitializer) {	1515	if (location == .StaticInitializer) {
...	@@ -1522,7 +1522,7 @@ pub const DeclGen = struct {	...	@@ -1522,7 +1522,7 @@ pub const DeclGen = struct {
1522	try writer.writeAll(")(");	1522	try writer.writeAll(")(");
1523	try dg.renderType(writer, backing_ty);	1523	try dg.renderType(writer, backing_ty);
1524	try writer.writeAll("){");	1524	try writer.writeAll("){");
1525	try dg.renderValue(writer, backing_ty, un.val.toValue(), initializer_type);	1525	try dg.renderValue(writer, backing_ty, Value.fromInterned(un.val), initializer_type);
1526	try writer.writeAll("})");	1526	try writer.writeAll("})");
1527	},	1527	},
1528	else => unreachable,	1528	else => unreachable,
...	@@ -1534,8 +1534,8 @@ pub const DeclGen = struct {	...	@@ -1534,8 +1534,8 @@ pub const DeclGen = struct {
1534	try writer.writeByte(')');	1534	try writer.writeByte(')');
1535	}	1535	}
1536		1536
1537	const field_i = mod.unionTagFieldIndex(union_obj, un.tag.toValue()).?;	1537	const field_i = mod.unionTagFieldIndex(union_obj, Value.fromInterned(un.tag)).?;
1538	const field_ty = union_obj.field_types.get(ip)[field_i].toType();	1538	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_i]);
1539	const field_name = union_obj.field_names.get(ip)[field_i];	1539	const field_name = union_obj.field_names.get(ip)[field_i];
1540	if (union_obj.getLayout(ip) == .Packed) {	1540	if (union_obj.getLayout(ip) == .Packed) {
1541	if (field_ty.hasRuntimeBits(mod)) {	1541	if (field_ty.hasRuntimeBits(mod)) {
...	@@ -1548,7 +1548,7 @@ pub const DeclGen = struct {	...	@@ -1548,7 +1548,7 @@ pub const DeclGen = struct {
1548	try dg.renderType(writer, ty);	1548	try dg.renderType(writer, ty);
1549	try writer.writeByte(')');	1549	try writer.writeByte(')');
1550	}	1550	}
1551	try dg.renderValue(writer, field_ty, un.val.toValue(), initializer_type);	1551	try dg.renderValue(writer, field_ty, Value.fromInterned(un.val), initializer_type);
1552	} else {	1552	} else {
1553	try writer.writeAll("0");	1553	try writer.writeAll("0");
1554	}	1554	}
...	@@ -1560,7 +1560,7 @@ pub const DeclGen = struct {	...	@@ -1560,7 +1560,7 @@ pub const DeclGen = struct {
1560	const layout = mod.getUnionLayout(union_obj);	1560	const layout = mod.getUnionLayout(union_obj);
1561	if (layout.tag_size != 0) {	1561	if (layout.tag_size != 0) {
1562	try writer.writeAll(" .tag = ");	1562	try writer.writeAll(" .tag = ");
1563	try dg.renderValue(writer, tag_ty, un.tag.toValue(), initializer_type);	1563	try dg.renderValue(writer, tag_ty, Value.fromInterned(un.tag), initializer_type);
1564	}	1564	}
1565	if (ty.unionHasAllZeroBitFieldTypes(mod)) return try writer.writeByte('}');	1565	if (ty.unionHasAllZeroBitFieldTypes(mod)) return try writer.writeByte('}');
1566	if (layout.tag_size != 0) try writer.writeByte(',');	1566	if (layout.tag_size != 0) try writer.writeByte(',');
...	@@ -1568,11 +1568,11 @@ pub const DeclGen = struct {	...	@@ -1568,11 +1568,11 @@ pub const DeclGen = struct {
1568	}	1568	}
1569	if (field_ty.hasRuntimeBits(mod)) {	1569	if (field_ty.hasRuntimeBits(mod)) {
1570	try writer.print(" .{ } = ", .{fmtIdent(ip.stringToSlice(field_name))});	1570	try writer.print(" .{ } = ", .{fmtIdent(ip.stringToSlice(field_name))});
1571	try dg.renderValue(writer, field_ty, un.val.toValue(), initializer_type);	1571	try dg.renderValue(writer, field_ty, Value.fromInterned(un.val), initializer_type);
1572	try writer.writeByte(' ');	1572	try writer.writeByte(' ');
1573	} else for (union_obj.field_types.get(ip)) \|this_field_ty\| {	1573	} else for (union_obj.field_types.get(ip)) \|this_field_ty\| {
1574	if (!this_field_ty.toType().hasRuntimeBits(mod)) continue;	1574	if (!Type.fromInterned(this_field_ty).hasRuntimeBits(mod)) continue;
1575	try dg.renderValue(writer, this_field_ty.toType(), Value.undef, initializer_type);	1575	try dg.renderValue(writer, Type.fromInterned(this_field_ty), Value.undef, initializer_type);
1576	break;	1576	break;
1577	}	1577	}
1578	if (ty.unionTagTypeSafety(mod)) \|_\| try writer.writeByte('}');	1578	if (ty.unionTagTypeSafety(mod)) \|_\| try writer.writeByte('}');
...	@@ -2527,7 +2527,7 @@ pub fn genErrDecls(o: *Object) !void {	...	@@ -2527,7 +2527,7 @@ pub fn genErrDecls(o: *Object) !void {
2527	.ty = .anyerror_type,	2527	.ty = .anyerror_type,
2528	.name = name_nts,	2528	.name = name_nts,
2529	} });	2529	} });
2530	try o.dg.renderValue(writer, Type.anyerror, err_val.toValue(), .Other);	2530	try o.dg.renderValue(writer, Type.anyerror, Value.fromInterned(err_val), .Other);
2531	try writer.print(" = {d}u,\n", .{value});	2531	try writer.print(" = {d}u,\n", .{value});
2532	}	2532	}
2533	o.indent_writer.popIndent();	2533	o.indent_writer.popIndent();
...	@@ -2557,7 +2557,7 @@ pub fn genErrDecls(o: *Object) !void {	...	@@ -2557,7 +2557,7 @@ pub fn genErrDecls(o: *Object) !void {
2557	try writer.writeAll("static ");	2557	try writer.writeAll("static ");
2558	try o.dg.renderTypeAndName(writer, name_ty, .{ .identifier = identifier }, Const, .none, .complete);	2558	try o.dg.renderTypeAndName(writer, name_ty, .{ .identifier = identifier }, Const, .none, .complete);
2559	try writer.writeAll(" = ");	2559	try writer.writeAll(" = ");
2560	try o.dg.renderValue(writer, name_ty, name_val.toValue(), .StaticInitializer);	2560	try o.dg.renderValue(writer, name_ty, Value.fromInterned(name_val), .StaticInitializer);
2561	try writer.writeAll(";\n");	2561	try writer.writeAll(";\n");
2562	}	2562	}
2563		2563
...	@@ -2590,7 +2590,7 @@ fn genExports(o: *Object) !void {	...	@@ -2590,7 +2590,7 @@ fn genExports(o: *Object) !void {
2590	const ip = &mod.intern_pool;	2590	const ip = &mod.intern_pool;
2591	const decl_index = o.dg.pass.decl;	2591	const decl_index = o.dg.pass.decl;
2592	const decl = mod.declPtr(decl_index);	2592	const decl = mod.declPtr(decl_index);
2593	const tv: TypedValue = .{ .ty = decl.ty, .val = (try decl.internValue(mod)).toValue() };	2593	const tv: TypedValue = .{ .ty = decl.ty, .val = Value.fromInterned((try decl.internValue(mod))) };
2594	const fwd = o.dg.fwd_decl.writer();	2594	const fwd = o.dg.fwd_decl.writer();
2595		2595
2596	const exports = mod.decl_exports.get(decl_index) orelse return;	2596	const exports = mod.decl_exports.get(decl_index) orelse return;
...	@@ -2677,7 +2677,7 @@ pub fn genLazyFn(o: *Object, lazy_fn: LazyFnMap.Entry) !void {	...	@@ -2677,7 +2677,7 @@ pub fn genLazyFn(o: *Object, lazy_fn: LazyFnMap.Entry) !void {
2677	});	2677	});
2678	try o.dg.renderTypeAndName(w, name_ty, .{ .identifier = "name" }, Const, .none, .complete);	2678	try o.dg.renderTypeAndName(w, name_ty, .{ .identifier = "name" }, Const, .none, .complete);
2679	try w.writeAll(" = ");	2679	try w.writeAll(" = ");
2680	try o.dg.renderValue(w, name_ty, name_val.toValue(), .Initializer);	2680	try o.dg.renderValue(w, name_ty, Value.fromInterned(name_val), .Initializer);
2681	try w.writeAll(";\n return (");	2681	try w.writeAll(";\n return (");
2682	try o.dg.renderType(w, name_slice_ty);	2682	try o.dg.renderType(w, name_slice_ty);
2683	try w.print("){{{}, {}}};\n", .{	2683	try w.print("){{{}, {}}};\n", .{
...	@@ -2817,7 +2817,7 @@ pub fn genDecl(o: *Object) !void {	...	@@ -2817,7 +2817,7 @@ pub fn genDecl(o: *Object) !void {
2817	const mod = o.dg.module;	2817	const mod = o.dg.module;
2818	const decl_index = o.dg.pass.decl;	2818	const decl_index = o.dg.pass.decl;
2819	const decl = mod.declPtr(decl_index);	2819	const decl = mod.declPtr(decl_index);
2820	const tv: TypedValue = .{ .ty = decl.ty, .val = (try decl.internValue(mod)).toValue() };	2820	const tv: TypedValue = .{ .ty = decl.ty, .val = Value.fromInterned((try decl.internValue(mod))) };
2821		2821
2822	if (!tv.ty.isFnOrHasRuntimeBitsIgnoreComptime(mod)) return;	2822	if (!tv.ty.isFnOrHasRuntimeBitsIgnoreComptime(mod)) return;
2823	if (tv.val.getExternFunc(mod)) \|_\| {	2823	if (tv.val.getExternFunc(mod)) \|_\| {
...	@@ -2843,7 +2843,7 @@ pub fn genDecl(o: *Object) !void {	...	@@ -2843,7 +2843,7 @@ pub fn genDecl(o: *Object) !void {
2843	try o.dg.renderTypeAndName(w, tv.ty, decl_c_value, .{}, decl.alignment, .complete);	2843	try o.dg.renderTypeAndName(w, tv.ty, decl_c_value, .{}, decl.alignment, .complete);
2844	if (decl.@"linksection" != .none) try w.writeAll(", read, write)");	2844	if (decl.@"linksection" != .none) try w.writeAll(", read, write)");
2845	try w.writeAll(" = ");	2845	try w.writeAll(" = ");
2846	try o.dg.renderValue(w, tv.ty, variable.init.toValue(), .StaticInitializer);	2846	try o.dg.renderValue(w, tv.ty, Value.fromInterned(variable.init), .StaticInitializer);
2847	try w.writeByte(';');	2847	try w.writeByte(';');
2848	try o.indent_writer.insertNewline();	2848	try o.indent_writer.insertNewline();
2849	} else {	2849	} else {
...	@@ -3491,7 +3491,7 @@ fn airLoad(f: *Function, inst: Air.Inst.Index) !CValue {	...	@@ -3491,7 +3491,7 @@ fn airLoad(f: *Function, inst: Air.Inst.Index) !CValue {
3491	const ptr_ty = f.typeOf(ty_op.operand);	3491	const ptr_ty = f.typeOf(ty_op.operand);
3492	const ptr_scalar_ty = ptr_ty.scalarType(mod);	3492	const ptr_scalar_ty = ptr_ty.scalarType(mod);
3493	const ptr_info = ptr_scalar_ty.ptrInfo(mod);	3493	const ptr_info = ptr_scalar_ty.ptrInfo(mod);
3494	const src_ty = ptr_info.child.toType();	3494	const src_ty = Type.fromInterned(ptr_info.child);
3495		3495
3496	if (!src_ty.hasRuntimeBitsIgnoreComptime(mod)) {	3496	if (!src_ty.hasRuntimeBitsIgnoreComptime(mod)) {
3497	try reap(f, inst, &.{ty_op.operand});	3497	try reap(f, inst, &.{ty_op.operand});
...	@@ -3767,7 +3767,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {	...	@@ -3767,7 +3767,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {
3767	try writer.writeAll("memset(");	3767	try writer.writeAll("memset(");
3768	try f.writeCValue(writer, ptr_val, .FunctionArgument);	3768	try f.writeCValue(writer, ptr_val, .FunctionArgument);
3769	try writer.writeAll(", 0xaa, sizeof(");	3769	try writer.writeAll(", 0xaa, sizeof(");
3770	try f.renderType(writer, ptr_info.child.toType());	3770	try f.renderType(writer, Type.fromInterned(ptr_info.child));
3771	try writer.writeAll("));\n");	3771	try writer.writeAll("));\n");
3772	}	3772	}
3773	return .none;	3773	return .none;
...	@@ -3777,7 +3777,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {	...	@@ -3777,7 +3777,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {
3777	ptr_info.flags.alignment.compare(.gte, src_ty.abiAlignment(mod))	3777	ptr_info.flags.alignment.compare(.gte, src_ty.abiAlignment(mod))
3778	else	3778	else
3779	true;	3779	true;
3780	const is_array = lowersToArray(ptr_info.child.toType(), mod);	3780	const is_array = lowersToArray(Type.fromInterned(ptr_info.child), mod);
3781	const need_memcpy = !is_aligned or is_array;	3781	const need_memcpy = !is_aligned or is_array;
3782		3782
3783	const src_val = try f.resolveInst(bin_op.rhs);	3783	const src_val = try f.resolveInst(bin_op.rhs);
...	@@ -3789,7 +3789,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {	...	@@ -3789,7 +3789,7 @@ fn airStore(f: *Function, inst: Air.Inst.Index, safety: bool) !CValue {
3789	if (need_memcpy) {	3789	if (need_memcpy) {
3790	// For this memcpy to safely work we need the rhs to have the same	3790	// For this memcpy to safely work we need the rhs to have the same
3791	// underlying type as the lhs (i.e. they must both be arrays of the same underlying type).	3791	// underlying type as the lhs (i.e. they must both be arrays of the same underlying type).
3792	assert(src_ty.eql(ptr_info.child.toType(), f.object.dg.module));	3792	assert(src_ty.eql(Type.fromInterned(ptr_info.child), f.object.dg.module));
3793		3793
3794	// If the source is a constant, writeCValue will emit a brace initialization	3794	// If the source is a constant, writeCValue will emit a brace initialization
3795	// so work around this by initializing into new local.	3795	// so work around this by initializing into new local.
...	@@ -5404,7 +5404,7 @@ fn fieldLocation(	...	@@ -5404,7 +5404,7 @@ fn fieldLocation(
5404	const union_obj = mod.typeToUnion(container_ty).?;	5404	const union_obj = mod.typeToUnion(container_ty).?;
5405	return switch (union_obj.getLayout(ip)) {	5405	return switch (union_obj.getLayout(ip)) {
5406	.Auto, .Extern => {	5406	.Auto, .Extern => {
5407	const field_ty = union_obj.field_types.get(ip)[field_index].toType();	5407	const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
5408	if (!field_ty.hasRuntimeBitsIgnoreComptime(mod))	5408	if (!field_ty.hasRuntimeBitsIgnoreComptime(mod))
5409	return if (container_ty.unionTagTypeSafety(mod) != null and	5409	return if (container_ty.unionTagTypeSafety(mod) != null and
5410	!container_ty.unionHasAllZeroBitFieldTypes(mod))	5410	!container_ty.unionHasAllZeroBitFieldTypes(mod))
...	@@ -6754,7 +6754,7 @@ fn airShuffle(f: *Function, inst: Air.Inst.Index) !CValue {	...	@@ -6754,7 +6754,7 @@ fn airShuffle(f: *Function, inst: Air.Inst.Index) !CValue {
6754	const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;	6754	const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;
6755	const extra = f.air.extraData(Air.Shuffle, ty_pl.payload).data;	6755	const extra = f.air.extraData(Air.Shuffle, ty_pl.payload).data;
6756		6756
6757	const mask = extra.mask.toValue();	6757	const mask = Value.fromInterned(extra.mask);
6758	const lhs = try f.resolveInst(extra.a);	6758	const lhs = try f.resolveInst(extra.a);
6759	const rhs = try f.resolveInst(extra.b);	6759	const rhs = try f.resolveInst(extra.b);
6760		6760
...	@@ -7947,7 +7947,7 @@ fn lowerFnRetTy(ret_ty: Type, mod: *Module) !Type {	...	@@ -7947,7 +7947,7 @@ fn lowerFnRetTy(ret_ty: Type, mod: *Module) !Type {
7947	.types = &types,	7947	.types = &types,
7948	.values = &values,	7948	.values = &values,
7949	});	7949	});
7950	return interned.toType();	7950	return Type.fromInterned(interned);
7951	}	7951	}
7952		7952
7953	return if (ret_ty.hasRuntimeBitsIgnoreComptime(mod)) ret_ty else Type.void;	7953	return if (ret_ty.hasRuntimeBitsIgnoreComptime(mod)) ret_ty else Type.void;

src/codegen/c/type.zig+15-15

...	@@ -1481,7 +1481,7 @@ pub const CType = extern union {	...	@@ -1481,7 +1481,7 @@ pub const CType = extern union {
1481	info.flags.vector_index == .none)	1481	info.flags.vector_index == .none)
1482	try mod.intType(.unsigned, info.packed_offset.host_size * 8)	1482	try mod.intType(.unsigned, info.packed_offset.host_size * 8)
1483	else	1483	else
1484	info.child.toType();	1484	Type.fromInterned(info.child);
1485		1485
1486	if (try lookup.typeToIndex(pointee_ty, .forward)) \|child_idx\| {	1486	if (try lookup.typeToIndex(pointee_ty, .forward)) \|child_idx\| {
1487	self.storage = .{ .child = .{	1487	self.storage = .{ .child = .{
...	@@ -1496,7 +1496,7 @@ pub const CType = extern union {	...	@@ -1496,7 +1496,7 @@ pub const CType = extern union {
1496		1496
1497	.Struct, .Union => \|zig_ty_tag\| if (ty.containerLayout(mod) == .Packed) {	1497	.Struct, .Union => \|zig_ty_tag\| if (ty.containerLayout(mod) == .Packed) {
1498	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {	1498	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {
1499	try self.initType(packed_struct.backingIntType(ip).toType(), kind, lookup);	1499	try self.initType(Type.fromInterned(packed_struct.backingIntType(ip).*), kind, lookup);
1500	} else {	1500	} else {
1501	const bits: u16 = @intCast(ty.bitSize(mod));	1501	const bits: u16 = @intCast(ty.bitSize(mod));
1502	const int_ty = try mod.intType(.unsigned, bits);	1502	const int_ty = try mod.intType(.unsigned, bits);
...	@@ -1736,10 +1736,10 @@ pub const CType = extern union {	...	@@ -1736,10 +1736,10 @@ pub const CType = extern union {
1736	.complete, .parameter, .global => .parameter,	1736	.complete, .parameter, .global => .parameter,
1737	.payload => unreachable,	1737	.payload => unreachable,
1738	};	1738	};
1739	_ = try lookup.typeToIndex(info.return_type.toType(), param_kind);	1739	_ = try lookup.typeToIndex(Type.fromInterned(info.return_type), param_kind);
1740	for (info.param_types.get(ip)) \|param_type\| {	1740	for (info.param_types.get(ip)) \|param_type\| {
1741	if (!param_type.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	1741	if (!Type.fromInterned(param_type).hasRuntimeBitsIgnoreComptime(mod)) continue;
1742	_ = try lookup.typeToIndex(param_type.toType(), param_kind);	1742	_ = try lookup.typeToIndex(Type.fromInterned(param_type), param_kind);
1743	}	1743	}
1744	}	1744	}
1745	self.init(if (info.is_var_args) .varargs_function else .function);	1745	self.init(if (info.is_var_args) .varargs_function else .function);
...	@@ -2033,21 +2033,21 @@ pub const CType = extern union {	...	@@ -2033,21 +2033,21 @@ pub const CType = extern union {
2033		2033
2034	var c_params_len: usize = 0;	2034	var c_params_len: usize = 0;
2035	for (info.param_types.get(ip)) \|param_type\| {	2035	for (info.param_types.get(ip)) \|param_type\| {
2036	if (!param_type.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	2036	if (!Type.fromInterned(param_type).hasRuntimeBitsIgnoreComptime(mod)) continue;
2037	c_params_len += 1;	2037	c_params_len += 1;
2038	}	2038	}
2039		2039
2040	const params_pl = try arena.alloc(Index, c_params_len);	2040	const params_pl = try arena.alloc(Index, c_params_len);
2041	var c_param_i: usize = 0;	2041	var c_param_i: usize = 0;
2042	for (info.param_types.get(ip)) \|param_type\| {	2042	for (info.param_types.get(ip)) \|param_type\| {
2043	if (!param_type.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	2043	if (!Type.fromInterned(param_type).hasRuntimeBitsIgnoreComptime(mod)) continue;
2044	params_pl[c_param_i] = store.set.typeToIndex(param_type.toType(), mod, param_kind).?;	2044	params_pl[c_param_i] = store.set.typeToIndex(Type.fromInterned(param_type), mod, param_kind).?;
2045	c_param_i += 1;	2045	c_param_i += 1;
2046	}	2046	}
2047		2047
2048	const fn_pl = try arena.create(Payload.Function);	2048	const fn_pl = try arena.create(Payload.Function);
2049	fn_pl.* = .{ .base = .{ .tag = t }, .data = .{	2049	fn_pl.* = .{ .base = .{ .tag = t }, .data = .{
2050	.return_type = store.set.typeToIndex(info.return_type.toType(), mod, param_kind).?,	2050	.return_type = store.set.typeToIndex(Type.fromInterned(info.return_type), mod, param_kind).?,
2051	.param_types = params_pl,	2051	.param_types = params_pl,
2052	} };	2052	} };
2053	return initPayload(fn_pl);	2053	return initPayload(fn_pl);
...	@@ -2167,18 +2167,18 @@ pub const CType = extern union {	...	@@ -2167,18 +2167,18 @@ pub const CType = extern union {
2167	.payload => unreachable,	2167	.payload => unreachable,
2168	};	2168	};
2169		2169
2170	if (!self.eqlRecurse(info.return_type.toType(), data.return_type, param_kind))	2170	if (!self.eqlRecurse(Type.fromInterned(info.return_type), data.return_type, param_kind))
2171	return false;	2171	return false;
2172		2172
2173	var c_param_i: usize = 0;	2173	var c_param_i: usize = 0;
2174	for (info.param_types.get(ip)) \|param_type\| {	2174	for (info.param_types.get(ip)) \|param_type\| {
2175	if (!param_type.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	2175	if (!Type.fromInterned(param_type).hasRuntimeBitsIgnoreComptime(mod)) continue;
2176		2176
2177	if (c_param_i >= data.param_types.len) return false;	2177	if (c_param_i >= data.param_types.len) return false;
2178	const param_cty = data.param_types[c_param_i];	2178	const param_cty = data.param_types[c_param_i];
2179	c_param_i += 1;	2179	c_param_i += 1;
2180		2180
2181	if (!self.eqlRecurse(param_type.toType(), param_cty, param_kind))	2181	if (!self.eqlRecurse(Type.fromInterned(param_type), param_cty, param_kind))
2182	return false;	2182	return false;
2183	}	2183	}
2184	return c_param_i == data.param_types.len;	2184	return c_param_i == data.param_types.len;
...	@@ -2282,10 +2282,10 @@ pub const CType = extern union {	...	@@ -2282,10 +2282,10 @@ pub const CType = extern union {
2282	.payload => unreachable,	2282	.payload => unreachable,
2283	};	2283	};
2284		2284
2285	self.updateHasherRecurse(hasher, info.return_type.toType(), param_kind);	2285	self.updateHasherRecurse(hasher, Type.fromInterned(info.return_type), param_kind);
2286	for (info.param_types.get(ip)) \|param_type\| {	2286	for (info.param_types.get(ip)) \|param_type\| {
2287	if (!param_type.toType().hasRuntimeBitsIgnoreComptime(mod)) continue;	2287	if (!Type.fromInterned(param_type).hasRuntimeBitsIgnoreComptime(mod)) continue;
2288	self.updateHasherRecurse(hasher, param_type.toType(), param_kind);	2288	self.updateHasherRecurse(hasher, Type.fromInterned(param_type), param_kind);
2289	}	2289	}
2290	},	2290	},
2291		2291

src/codegen/llvm.zig+128-128

src/codegen/spirv.zig+47-47

src/link/C.zig+3-2

...	@@ -13,6 +13,7 @@ const codegen = @import("../codegen/c.zig");	...	@@ -13,6 +13,7 @@ const codegen = @import("../codegen/c.zig");
13	const link = @import("../link.zig");	13	const link = @import("../link.zig");
14	const trace = @import("../tracy.zig").trace;	14	const trace = @import("../tracy.zig").trace;
15	const Type = @import("../type.zig").Type;	15	const Type = @import("../type.zig").Type;
		16	const Value = @import("../value.zig").Value;
16	const Air = @import("../Air.zig");	17	const Air = @import("../Air.zig");
17	const Liveness = @import("../Liveness.zig");	18	const Liveness = @import("../Liveness.zig");
18		19
...	@@ -254,8 +255,8 @@ fn updateAnonDecl(self: C, module: Module, i: usize) !void {	...	@@ -254,8 +255,8 @@ fn updateAnonDecl(self: C, module: Module, i: usize) !void {
254	}	255	}
255		256
256	const tv: @import("../TypedValue.zig") = .{	257	const tv: @import("../TypedValue.zig") = .{
257	.ty = module.intern_pool.typeOf(anon_decl).toType(),	258	.ty = Type.fromInterned(module.intern_pool.typeOf(anon_decl)),
258	.val = anon_decl.toValue(),	259	.val = Value.fromInterned(anon_decl),
259	};	260	};
260	const c_value: codegen.CValue = .{ .constant = anon_decl };	261	const c_value: codegen.CValue = .{ .constant = anon_decl };
261	const alignment: Alignment = self.aligned_anon_decls.get(anon_decl) orelse .none;	262	const alignment: Alignment = self.aligned_anon_decls.get(anon_decl) orelse .none;

src/link/Coff.zig+4-3

src/link/Dwarf.zig+9-9

src/link/Elf/ZigObject.zig+6-4

src/link/MachO.zig+4-4

src/link/Plan9.zig+5-3

src/link/Wasm.zig+7-6

src/print_air.zig+2-2

...	@@ -940,10 +940,10 @@ const Writer = struct {	...	@@ -940,10 +940,10 @@ const Writer = struct {
940	return s.print("@{}", .{operand});	940	return s.print("@{}", .{operand});
941	} else if (Air.refToInterned(operand)) \|ip_index\| {	941	} else if (Air.refToInterned(operand)) \|ip_index\| {
942	const mod = w.module;	942	const mod = w.module;
943	const ty = mod.intern_pool.indexToKey(ip_index).typeOf().toType();	943	const ty = Type.fromInterned(mod.intern_pool.indexToKey(ip_index).typeOf());
944	try s.print("<{}, {}>", .{	944	try s.print("<{}, {}>", .{
945	ty.fmt(mod),	945	ty.fmt(mod),
946	ip_index.toValue().fmtValue(ty, mod),	946	Value.fromInterned(ip_index).fmtValue(ty, mod),
947	});	947	});
948	} else {	948	} else {
949	return w.writeInstIndex(s, Air.refToIndex(operand).?, dies);	949	return w.writeInstIndex(s, Air.refToIndex(operand).?, dies);

src/type.zig+163-158

 @@ -185,8 +185,8 @@ pub const Type = struct {
                 if (info.sentinel != .none) switch (info.flags.size) {
                     .One, .C => unreachable,
-                    .Many => try writer.print("[*:{}]", .{info.sentinel.toValue().fmtValue(info.child.toType(), mod)}),
+                    .Many => try writer.print("[*:{}]", .{Value.fromInterned(info.sentinel).fmtValue(Type.fromInterned(info.child), mod)}),
-                    .Slice => try writer.print("[:{}]", .{info.sentinel.toValue().fmtValue(info.child.toType(), mod)}),
+                    .Slice => try writer.print("[:{}]", .{Value.fromInterned(info.sentinel).fmtValue(Type.fromInterned(info.child), mod)}),
                 } else switch (info.flags.size) {
                     .One => try writer.writeAll("*"),
                     .Many => try writer.writeAll("[*]"),
 @@ -200,7 +200,7 @@ pub const Type = struct {
                     const alignment = if (info.flags.alignment != .none)
                         info.flags.alignment
                     else
-                        info.child.toType().abiAlignment(mod);
+                        Type.fromInterned(info.child).abiAlignment(mod);
                     try writer.print("align({d}", .{alignment.toByteUnits(0)});
                     if (info.packed_offset.bit_offset != 0 or info.packed_offset.host_size != 0) {
 @@ -222,36 +222,36 @@ pub const Type = struct {
                 if (info.flags.is_volatile) try writer.writeAll("volatile ");
                 if (info.flags.is_allowzero and info.flags.size != .C) try writer.writeAll("allowzero ");
-                try print(info.child.toType(), writer, mod);
+                try print(Type.fromInterned(info.child), writer, mod);
                 return;
             },
             .array_type => |array_type| {
                 if (array_type.sentinel == .none) {
                     try writer.print("[{d}]", .{array_type.len});
-                    try print(array_type.child.toType(), writer, mod);
+                    try print(Type.fromInterned(array_type.child), writer, mod);
                 } else {
                     try writer.print("[{d}:{}]", .{
                         array_type.len,
-                        array_type.sentinel.toValue().fmtValue(array_type.child.toType(), mod),
+                        Value.fromInterned(array_type.sentinel).fmtValue(Type.fromInterned(array_type.child), mod),
                     });
-                    try print(array_type.child.toType(), writer, mod);
+                    try print(Type.fromInterned(array_type.child), writer, mod);
                 }
                 return;
             },
             .vector_type => |vector_type| {
                 try writer.print("@Vector({d}, ", .{vector_type.len});
-                try print(vector_type.child.toType(), writer, mod);
+                try print(Type.fromInterned(vector_type.child), writer, mod);
                 try writer.writeAll(")");
                 return;
             },
             .opt_type => |child| {
                 try writer.writeByte('?');
-                return print(child.toType(), writer, mod);
+                return print(Type.fromInterned(child), writer, mod);
             },
             .error_union_type => |error_union_type| {
-                try print(error_union_type.error_set_type.toType(), writer, mod);
+                try print(Type.fromInterned(error_union_type.error_set_type), writer, mod);
                 try writer.writeByte('!');
-                try print(error_union_type.payload_type.toType(), writer, mod);
+                try print(Type.fromInterned(error_union_type.payload_type), writer, mod);
                 return;
             },
             .inferred_error_set_type => |func_index| {
 @@ -342,10 +342,10 @@ pub const Type = struct {
                         try writer.print("{}: ", .{anon_struct.names.get(ip)[i].fmt(&mod.intern_pool)});
                     }
-                    try print(field_ty.toType(), writer, mod);
+                    try print(Type.fromInterned(field_ty), writer, mod);
                     if (val != .none) {
-                        try writer.print(" = {}", .{val.toValue().fmtValue(field_ty.toType(), mod)});
+                        try writer.print(" = {}", .{Value.fromInterned(val).fmtValue(Type.fromInterned(field_ty), mod)});
                     }
                 }
                 try writer.writeAll("}");
 @@ -382,7 +382,7 @@ pub const Type = struct {
                     if (param_ty == .generic_poison_type) {
                         try writer.writeAll("anytype");
                     } else {
-                        try print(param_ty.toType(), writer, mod);
+                        try print(Type.fromInterned(param_ty), writer, mod);
                     }
                 }
                 if (fn_info.is_var_args) {
 @@ -403,13 +403,13 @@ pub const Type = struct {
                 if (fn_info.return_type == .generic_poison_type) {
                     try writer.writeAll("anytype");
                 } else {
-                    try print(fn_info.return_type.toType(), writer, mod);
+                    try print(Type.fromInterned(fn_info.return_type), writer, mod);
                 }
             },
             .anyframe_type => |child| {
                 if (child == .none) return writer.writeAll("anyframe");
                 try writer.writeAll("anyframe->");
-                return print(child.toType(), writer, mod);
+                return print(Type.fromInterned(child), writer, mod);
             },
             // values, not types
 @@ -435,13 +435,18 @@ pub const Type = struct {
         }
     }
+    pub fn fromInterned(i: InternPool.Index) Type {
+        assert(i != .none);
+        return .{ .ip_index = i };
+    }
     pub fn toIntern(ty: Type) InternPool.Index {
         assert(ty.ip_index != .none);
         return ty.ip_index;
     }
     pub fn toValue(self: Type) Value {
-        return self.toIntern().toValue();
+        return Value.fromInterned(self.toIntern());
     }
     const RuntimeBitsError = Module.CompileError || error{NeedLazy};
 @@ -482,18 +487,18 @@ pub const Type = struct {
                 .anyframe_type => true,
                 .array_type => |array_type| {
                     if (array_type.sentinel != .none) {
-                        return array_type.child.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
+                        return Type.fromInterned(array_type.child).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
                     } else {
                         return array_type.len > 0 and
-                            try array_type.child.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
+                            try Type.fromInterned(array_type.child).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
                     }
                 },
                 .vector_type => |vector_type| {
                     return vector_type.len > 0 and
-                        try vector_type.child.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
+                        try Type.fromInterned(vector_type.child).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat);
                 },
                 .opt_type => |child| {
-                    const child_ty = child.toType();
+                    const child_ty = Type.fromInterned(child);
                     if (child_ty.isNoReturn(mod)) {
                         // Then the optional is comptime-known to be null.
                         return false;
 @@ -577,7 +582,7 @@ pub const Type = struct {
                     }
                     for (0..struct_type.field_types.len) |i| {
                         if (struct_type.comptime_bits.getBit(ip, i)) continue;
-                        const field_ty = struct_type.field_types.get(ip)[i].toType();
+                        const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
                         if (try field_ty.hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat))
                             return true;
                     } else {
 @@ -587,7 +592,7 @@ pub const Type = struct {
                 .anon_struct_type => |tuple| {
                     for (tuple.types.get(ip), tuple.values.get(ip)) |field_ty, val| {
                         if (val != .none) continue; // comptime field
-                        if (try field_ty.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat)) return true;
+                        if (try Type.fromInterned(field_ty).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat)) return true;
                     }
                     return false;
                 },
 @@ -607,7 +612,7 @@ pub const Type = struct {
                             // tag_ty will be `none` if this union's tag type is not resolved yet,
                             // in which case we want control flow to continue down below.
                             if (tag_ty != .none and
-                                try tag_ty.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat))
+                                try Type.fromInterned(tag_ty).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat))
                             {
                                 return true;
                             }
 @@ -621,7 +626,7 @@ pub const Type = struct {
                     }
                     const union_obj = ip.loadUnionType(union_type);
                     for (0..union_obj.field_types.len) |field_index| {
-                        const field_ty = union_obj.field_types.get(ip)[field_index].toType();
+                        const field_ty = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
                         if (try field_ty.hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat))
                             return true;
                     } else {
 @@ -630,7 +635,7 @@ pub const Type = struct {
                 },
                 .opaque_type => true,
-                .enum_type => |enum_type| enum_type.tag_ty.toType().hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat),
+                .enum_type => |enum_type| Type.fromInterned(enum_type.tag_ty).hasRuntimeBitsAdvanced(mod, ignore_comptime_only, strat),
                 // values, not types
                 .undef,
 @@ -676,7 +681,7 @@ pub const Type = struct {
             .func_type,
             => false,
-            .array_type => |array_type| array_type.child.toType().hasWellDefinedLayout(mod),
+            .array_type => |array_type| Type.fromInterned(array_type.child).hasWellDefinedLayout(mod),
             .opt_type => ty.isPtrLikeOptional(mod),
             .ptr_type => |ptr_type| ptr_type.flags.size != .Slice,
 @@ -783,7 +788,7 @@ pub const Type = struct {
         if (fn_info.is_generic) return false;
         if (fn_info.is_var_args) return true;
         if (fn_info.cc == .Inline) return false;
-        return !try fn_info.return_type.toType().comptimeOnlyAdvanced(mod, opt_sema);
+        return !try Type.fromInterned(fn_info.return_type).comptimeOnlyAdvanced(mod, opt_sema);
     }
     pub fn isFnOrHasRuntimeBits(ty: Type, mod: *Module) bool {
 @@ -817,13 +822,13 @@ pub const Type = struct {
                     return ptr_type.flags.alignment;
                 if (opt_sema) |sema| {
-                    const res = try ptr_type.child.toType().abiAlignmentAdvanced(mod, .{ .sema = sema });
+                    const res = try Type.fromInterned(ptr_type.child).abiAlignmentAdvanced(mod, .{ .sema = sema });
                     return res.scalar;
                 }
-                return (ptr_type.child.toType().abiAlignmentAdvanced(mod, .eager) catch unreachable).scalar;
+                return (Type.fromInterned(ptr_type.child).abiAlignmentAdvanced(mod, .eager) catch unreachable).scalar;
             },
-            .opt_type => |child| child.toType().ptrAlignmentAdvanced(mod, opt_sema),
+            .opt_type => |child| Type.fromInterned(child).ptrAlignmentAdvanced(mod, opt_sema),
             else => unreachable,
         };
     }
 @@ -891,10 +896,10 @@ pub const Type = struct {
                     return .{ .scalar = Alignment.fromByteUnits(@divExact(target.ptrBitWidth(), 8)) };
                 },
                 .array_type => |array_type| {
-                    return array_type.child.toType().abiAlignmentAdvanced(mod, strat);
+                    return Type.fromInterned(array_type.child).abiAlignmentAdvanced(mod, strat);
                 },
                 .vector_type => |vector_type| {
-                    const bits_u64 = try bitSizeAdvanced(vector_type.child.toType(), mod, opt_sema);
+                    const bits_u64 = try bitSizeAdvanced(Type.fromInterned(vector_type.child), mod, opt_sema);
                     const bits: u32 = @intCast(bits_u64);
                     const bytes = ((bits * vector_type.len) + 7) / 8;
                     const alignment = std.math.ceilPowerOfTwoAssert(u32, bytes);
 @@ -902,7 +907,7 @@ pub const Type = struct {
                 },
                 .opt_type => return abiAlignmentAdvancedOptional(ty, mod, strat),
-                .error_union_type => |info| return abiAlignmentAdvancedErrorUnion(ty, mod, strat, info.payload_type.toType()),
+                .error_union_type => |info| return abiAlignmentAdvancedErrorUnion(ty, mod, strat, Type.fromInterned(info.payload_type)),
                 .error_set_type, .inferred_error_set_type => {
                     const bits = mod.errorSetBits();
 @@ -992,14 +997,14 @@ pub const Type = struct {
                         switch (strat) {
                             .sema => |sema| try sema.resolveTypeLayout(ty),
                             .lazy => if (struct_type.backingIntType(ip).* == .none) return .{
-                                .val = (try mod.intern(.{ .int = .{
+                                .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                     .ty = .comptime_int_type,
                                     .storage = .{ .lazy_align = ty.toIntern() },
-                                } })).toValue(),
+                                } }))),
                             },
                             .eager => {},
                         }
-                        return .{ .scalar = struct_type.backingIntType(ip).toType().abiAlignment(mod) };
+                        return .{ .scalar = Type.fromInterned(struct_type.backingIntType(ip).*).abiAlignment(mod) };
                     }
                     const flags = struct_type.flagsPtr(ip).*;
 @@ -1010,25 +1015,25 @@ pub const Type = struct {
                         .sema => |sema| .{
                             .scalar = try sema.resolveStructAlignment(ty.toIntern(), struct_type),
                         },
-                        .lazy => .{ .val = (try mod.intern(.{ .int = .{
+                        .lazy => .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                             .ty = .comptime_int_type,
                             .storage = .{ .lazy_align = ty.toIntern() },
-                        } })).toValue() },
+                        } }))) },
                     };
                 },
                 .anon_struct_type => |tuple| {
                     var big_align: Alignment = .@"1";
                     for (tuple.types.get(ip), tuple.values.get(ip)) |field_ty, val| {
                         if (val != .none) continue; // comptime field
-                        switch (try field_ty.toType().abiAlignmentAdvanced(mod, strat)) {
+                        switch (try Type.fromInterned(field_ty).abiAlignmentAdvanced(mod, strat)) {
                             .scalar => |field_align| big_align = big_align.max(field_align),
                             .val => switch (strat) {
                                 .eager => unreachable, // field type alignment not resolved
                                 .sema => unreachable, // passed to abiAlignmentAdvanced above
-                                .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                                .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                     .ty = .comptime_int_type,
                                     .storage = .{ .lazy_align = ty.toIntern() },
-                                } })).toValue() },
+                                } }))) },
                             },
                         }
                     }
 @@ -1041,17 +1046,17 @@ pub const Type = struct {
                     if (!union_type.haveLayout(ip)) switch (strat) {
                         .eager => unreachable, // union layout not resolved
                         .sema => |sema| return .{ .scalar = try sema.resolveUnionAlignment(ty, union_type) },
-                        .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                        .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                             .ty = .comptime_int_type,
                             .storage = .{ .lazy_align = ty.toIntern() },
-                        } })).toValue() },
+                        } }))) },
                     };
                     return .{ .scalar = union_type.flagsPtr(ip).alignment };
                 },
                 .opaque_type => return .{ .scalar = .@"1" },
                 .enum_type => |enum_type| return .{
-                    .scalar = enum_type.tag_ty.toType().abiAlignment(mod),
+                    .scalar = Type.fromInterned(enum_type.tag_ty).abiAlignment(mod),
                 },
                 // values, not types
 @@ -1090,10 +1095,10 @@ pub const Type = struct {
         switch (strat) {
             .eager, .sema => {
                 if (!(payload_ty.hasRuntimeBitsAdvanced(mod, false, strat) catch |err| switch (err) {
-                    error.NeedLazy => return .{ .val = (try mod.intern(.{ .int = .{
+                    error.NeedLazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                         .ty = .comptime_int_type,
                         .storage = .{ .lazy_align = ty.toIntern() },
-                    } })).toValue() },
+                    } }))) },
                     else => |e| return e,
                 })) {
                     return .{ .scalar = code_align };
 @@ -1107,10 +1112,10 @@ pub const Type = struct {
                     .scalar => |payload_align| return .{ .scalar = code_align.max(payload_align) },
                     .val => {},
                 }
-                return .{ .val = (try mod.intern(.{ .int = .{
+                return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                     .ty = .comptime_int_type,
                     .storage = .{ .lazy_align = ty.toIntern() },
-                } })).toValue() };
+                } }))) };
             },
         }
     }
 @@ -1135,10 +1140,10 @@ pub const Type = struct {
         switch (strat) {
             .eager, .sema => {
                 if (!(child_type.hasRuntimeBitsAdvanced(mod, false, strat) catch |err| switch (err) {
-                    error.NeedLazy => return .{ .val = (try mod.intern(.{ .int = .{
+                    error.NeedLazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                         .ty = .comptime_int_type,
                         .storage = .{ .lazy_align = ty.toIntern() },
-                    } })).toValue() },
+                    } }))) },
                     else => |e| return e,
                 })) {
                     return .{ .scalar = .@"1" };
 @@ -1147,10 +1152,10 @@ pub const Type = struct {
             },
             .lazy => switch (try child_type.abiAlignmentAdvanced(mod, strat)) {
                 .scalar => |x| return .{ .scalar = x.max(.@"1") },
-                .val => return .{ .val = (try mod.intern(.{ .int = .{
+                .val => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                     .ty = .comptime_int_type,
                     .storage = .{ .lazy_align = ty.toIntern() },
-                } })).toValue() },
+                } }))) },
             },
         }
     }
 @@ -1205,14 +1210,14 @@ pub const Type = struct {
                 .array_type => |array_type| {
                     const len = array_type.len + @intFromBool(array_type.sentinel != .none);
                     if (len == 0) return .{ .scalar = 0 };
-                    switch (try array_type.child.toType().abiSizeAdvanced(mod, strat)) {
+                    switch (try Type.fromInterned(array_type.child).abiSizeAdvanced(mod, strat)) {
                         .scalar => |elem_size| return .{ .scalar = len * elem_size },
                         .val => switch (strat) {
                             .sema, .eager => unreachable,
-                            .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                            .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                 .ty = .comptime_int_type,
                                 .storage = .{ .lazy_size = ty.toIntern() },
-                            } })).toValue() },
+                            } }))) },
                         },
                     }
                 },
 @@ -1220,20 +1225,20 @@ pub const Type = struct {
                     const opt_sema = switch (strat) {
                         .sema => |sema| sema,
                         .eager => null,
-                        .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                        .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                             .ty = .comptime_int_type,
                             .storage = .{ .lazy_size = ty.toIntern() },
-                        } })).toValue() },
+                        } }))) },
                     };
-                    const elem_bits = try vector_type.child.toType().bitSizeAdvanced(mod, opt_sema);
+                    const elem_bits = try Type.fromInterned(vector_type.child).bitSizeAdvanced(mod, opt_sema);
                     const total_bits = elem_bits * vector_type.len;
                     const total_bytes = (total_bits + 7) / 8;
                     const alignment = switch (try ty.abiAlignmentAdvanced(mod, strat)) {
                         .scalar => |x| x,
-                        .val => return .{ .val = (try mod.intern(.{ .int = .{
+                        .val => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                             .ty = .comptime_int_type,
                             .storage = .{ .lazy_size = ty.toIntern() },
-                        } })).toValue() },
+                        } }))) },
                     };
                     return AbiSizeAdvanced{ .scalar = alignment.forward(total_bytes) };
                 },
 @@ -1247,15 +1252,15 @@ pub const Type = struct {
                 },
                 .error_union_type => |error_union_type| {
-                    const payload_ty = error_union_type.payload_type.toType();
+                    const payload_ty = Type.fromInterned(error_union_type.payload_type);
                     // This code needs to be kept in sync with the equivalent switch prong
                     // in abiAlignmentAdvanced.
                     const code_size = abiSize(Type.anyerror, mod);
                     if (!(payload_ty.hasRuntimeBitsAdvanced(mod, false, strat) catch |err| switch (err) {
-                        error.NeedLazy => return .{ .val = (try mod.intern(.{ .int = .{
+                        error.NeedLazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                             .ty = .comptime_int_type,
                             .storage = .{ .lazy_size = ty.toIntern() },
-                        } })).toValue() },
+                        } }))) },
                         else => |e| return e,
                     })) {
                         // Same as anyerror.
 @@ -1268,10 +1273,10 @@ pub const Type = struct {
                         .val => switch (strat) {
                             .sema => unreachable,
                             .eager => unreachable,
-                            .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                            .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                 .ty = .comptime_int_type,
                                 .storage = .{ .lazy_size = ty.toIntern() },
-                            } })).toValue() },
+                            } }))) },
                         },
                     };
 @@ -1358,18 +1363,18 @@ pub const Type = struct {
                         .lazy => switch (struct_type.layout) {
                             .Packed => {
                                 if (struct_type.backingIntType(ip).* == .none) return .{
-                                    .val = (try mod.intern(.{ .int = .{
+                                    .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                         .ty = .comptime_int_type,
                                         .storage = .{ .lazy_size = ty.toIntern() },
-                                    } })).toValue(),
+                                    } }))),
                                 };
                             },
                             .Auto, .Extern => {
                                 if (!struct_type.haveLayout(ip)) return .{
-                                    .val = (try mod.intern(.{ .int = .{
+                                    .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                         .ty = .comptime_int_type,
                                         .storage = .{ .lazy_size = ty.toIntern() },
-                                    } })).toValue(),
+                                    } }))),
                                 };
                             },
                         },
 @@ -1377,7 +1382,7 @@ pub const Type = struct {
                     }
                     return switch (struct_type.layout) {
                         .Packed => .{
-                            .scalar = struct_type.backingIntType(ip).toType().abiSize(mod),
+                            .scalar = Type.fromInterned(struct_type.backingIntType(ip).*).abiSize(mod),
                         },
                         .Auto, .Extern => .{ .scalar = struct_type.size(ip).* },
                     };
 @@ -1398,10 +1403,10 @@ pub const Type = struct {
                     switch (strat) {
                         .sema => |sema| try sema.resolveTypeLayout(ty),
                         .lazy => if (!union_type.flagsPtr(ip).status.haveLayout()) return .{
-                            .val = (try mod.intern(.{ .int = .{
+                            .val = Value.fromInterned((try mod.intern(.{ .int = .{
                                 .ty = .comptime_int_type,
                                 .storage = .{ .lazy_size = ty.toIntern() },
-                            } })).toValue(),
+                            } }))),
                         },
                         .eager => {},
                     }
 @@ -1409,7 +1414,7 @@ pub const Type = struct {
                     return .{ .scalar = union_type.size(ip).* };
                 },
                 .opaque_type => unreachable, // no size available
-                .enum_type => |enum_type| return AbiSizeAdvanced{ .scalar = enum_type.tag_ty.toType().abiSize(mod) },
+                .enum_type => |enum_type| return AbiSizeAdvanced{ .scalar = Type.fromInterned(enum_type.tag_ty).abiSize(mod) },
                 // values, not types
                 .undef,
 @@ -1447,10 +1452,10 @@ pub const Type = struct {
         }
         if (!(child_ty.hasRuntimeBitsAdvanced(mod, false, strat) catch |err| switch (err) {
-            error.NeedLazy => return .{ .val = (try mod.intern(.{ .int = .{
+            error.NeedLazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                 .ty = .comptime_int_type,
                 .storage = .{ .lazy_size = ty.toIntern() },
-            } })).toValue() },
+            } }))) },
             else => |e| return e,
         })) return AbiSizeAdvanced{ .scalar = 1 };
 @@ -1463,10 +1468,10 @@ pub const Type = struct {
             .val => switch (strat) {
                 .sema => unreachable,
                 .eager => unreachable,
-                .lazy => return .{ .val = (try mod.intern(.{ .int = .{
+                .lazy => return .{ .val = Value.fromInterned((try mod.intern(.{ .int = .{
                     .ty = .comptime_int_type,
                     .storage = .{ .lazy_size = ty.toIntern() },
-                } })).toValue() },
+                } }))) },
             },
         };
 @@ -1518,7 +1523,7 @@ pub const Type = struct {
             .array_type => |array_type| {
                 const len = array_type.len + @intFromBool(array_type.sentinel != .none);
                 if (len == 0) return 0;
-                const elem_ty = array_type.child.toType();
+                const elem_ty = Type.fromInterned(array_type.child);
                 const elem_size = @max(
                     (try elem_ty.abiAlignmentAdvanced(mod, strat)).scalar.toByteUnits(0),
                     (try elem_ty.abiSizeAdvanced(mod, strat)).scalar,
 @@ -1528,7 +1533,7 @@ pub const Type = struct {
                 return (len - 1) * 8 * elem_size + elem_bit_size;
             },
             .vector_type => |vector_type| {
-                const child_ty = vector_type.child.toType();
+                const child_ty = Type.fromInterned(vector_type.child);
                 const elem_bit_size = try bitSizeAdvanced(child_ty, mod, opt_sema);
                 return elem_bit_size * vector_type.len;
             },
 @@ -1600,7 +1605,7 @@ pub const Type = struct {
             .struct_type => |struct_type| {
                 if (struct_type.layout == .Packed) {
                     if (opt_sema) |sema| try sema.resolveTypeLayout(ty);
-                    return try struct_type.backingIntType(ip).*.toType().bitSizeAdvanced(mod, opt_sema);
+                    return try Type.fromInterned(struct_type.backingIntType(ip).*).bitSizeAdvanced(mod, opt_sema);
                 }
                 return (try ty.abiSizeAdvanced(mod, strat)).scalar * 8;
             },
 @@ -1625,13 +1630,13 @@ pub const Type = struct {
                 var size: u64 = 0;
                 for (0..union_obj.field_types.len) |field_index| {
                     const field_ty = union_obj.field_types.get(ip)[field_index];
-                    size = @max(size, try bitSizeAdvanced(field_ty.toType(), mod, opt_sema));
+                    size = @max(size, try bitSizeAdvanced(Type.fromInterned(field_ty), mod, opt_sema));
                 }
                 return size;
             },
             .opaque_type => unreachable,
-            .enum_type => |enum_type| return bitSizeAdvanced(enum_type.tag_ty.toType(), mod, opt_sema),
+            .enum_type => |enum_type| return bitSizeAdvanced(Type.fromInterned(enum_type.tag_ty), mod, opt_sema),
             // values, not types
             .undef,
 @@ -1665,10 +1670,10 @@ pub const Type = struct {
             .union_type => |union_type| union_type.haveLayout(ip),
             .array_type => |array_type| {
                 if ((array_type.len + @intFromBool(array_type.sentinel != .none)) == 0) return true;
-                return array_type.child.toType().layoutIsResolved(mod);
+                return Type.fromInterned(array_type.child).layoutIsResolved(mod);
             },
-            .opt_type => |child| child.toType().layoutIsResolved(mod),
+            .opt_type => |child| Type.fromInterned(child).layoutIsResolved(mod),
-            .error_union_type => |k| k.payload_type.toType().layoutIsResolved(mod),
+            .error_union_type => |k| Type.fromInterned(k.payload_type).layoutIsResolved(mod),
             else => true,
         };
     }
 @@ -1701,7 +1706,7 @@ pub const Type = struct {
     }
     pub fn slicePtrFieldType(ty: Type, mod: *const Module) Type {
-        return mod.intern_pool.slicePtrType(ty.toIntern()).toType();
+        return Type.fromInterned(mod.intern_pool.slicePtrType(ty.toIntern()));
     }
     pub fn isConstPtr(ty: Type, mod: *const Module) bool {
 @@ -1801,7 +1806,7 @@ pub const Type = struct {
     }
     pub fn childTypeIp(ty: Type, ip: *const InternPool) Type {
-        return ip.childType(ty.toIntern()).toType();
+        return Type.fromInterned(ip.childType(ty.toIntern()));
     }
     /// For *[N]T,       returns T.
 @@ -1816,16 +1821,16 @@ pub const Type = struct {
     pub fn elemType2(ty: Type, mod: *const Module) Type {
         return switch (mod.intern_pool.indexToKey(ty.toIntern())) {
             .ptr_type => |ptr_type| switch (ptr_type.flags.size) {
-                .One => ptr_type.child.toType().shallowElemType(mod),
+                .One => Type.fromInterned(ptr_type.child).shallowElemType(mod),
-                .Many, .C, .Slice => ptr_type.child.toType(),
+                .Many, .C, .Slice => Type.fromInterned(ptr_type.child),
             },
             .anyframe_type => |child| {
                 assert(child != .none);
-                return child.toType();
+                return Type.fromInterned(child);
             },
-            .vector_type => |vector_type| vector_type.child.toType(),
+            .vector_type => |vector_type| Type.fromInterned(vector_type.child),
-            .array_type => |array_type| array_type.child.toType(),
+            .array_type => |array_type| Type.fromInterned(array_type.child),
-            .opt_type => |child| mod.intern_pool.childType(child).toType(),
+            .opt_type => |child| Type.fromInterned(mod.intern_pool.childType(child)),
             else => unreachable,
         };
     }
 @@ -1849,7 +1854,7 @@ pub const Type = struct {
     /// Note that for C pointers this returns the type unmodified.
     pub fn optionalChild(ty: Type, mod: *const Module) Type {
         return switch (mod.intern_pool.indexToKey(ty.toIntern())) {
-            .opt_type => |child| child.toType(),
+            .opt_type => |child| Type.fromInterned(child),
             .ptr_type => |ptr_type| b: {
                 assert(ptr_type.flags.size == .C);
                 break :b ty;
 @@ -1866,7 +1871,7 @@ pub const Type = struct {
             .union_type => |union_type| switch (union_type.flagsPtr(ip).runtime_tag) {
                 .tagged => {
                     assert(union_type.flagsPtr(ip).status.haveFieldTypes());
-                    return union_type.enum_tag_ty.toType();
+                    return Type.fromInterned(union_type.enum_tag_ty);
                 },
                 else => null,
             },
 @@ -1882,7 +1887,7 @@ pub const Type = struct {
             .union_type => |union_type| {
                 if (!union_type.hasTag(ip)) return null;
                 assert(union_type.haveFieldTypes(ip));
-                return union_type.enum_tag_ty.toType();
+                return Type.fromInterned(union_type.enum_tag_ty);
             },
             else => null,
         };
 @@ -1892,7 +1897,7 @@ pub const Type = struct {
     /// not be stored at runtime.
     pub fn unionTagTypeHypothetical(ty: Type, mod: *Module) Type {
         const union_obj = mod.typeToUnion(ty).?;
-        return union_obj.enum_tag_ty.toType();
+        return Type.fromInterned(union_obj.enum_tag_ty);
     }
     pub fn unionFieldType(ty: Type, enum_tag: Value, mod: *Module) ?Type {
 @@ -1900,7 +1905,7 @@ pub const Type = struct {
         const union_obj = mod.typeToUnion(ty).?;
         const union_fields = union_obj.field_types.get(ip);
         const index = mod.unionTagFieldIndex(union_obj, enum_tag) orelse return null;
-        return union_fields[index].toType();
+        return Type.fromInterned(union_fields[index]);
     }
     pub fn unionTagFieldIndex(ty: Type, enum_tag: Value, mod: *Module) ?u32 {
 @@ -1912,7 +1917,7 @@ pub const Type = struct {
         const ip = &mod.intern_pool;
         const union_obj = mod.typeToUnion(ty).?;
         for (union_obj.field_types.get(ip)) |field_ty| {
-            if (field_ty.toType().hasRuntimeBits(mod)) return false;
+            if (Type.fromInterned(field_ty).hasRuntimeBits(mod)) return false;
         }
         return true;
     }
 @@ -1946,12 +1951,12 @@ pub const Type = struct {
     /// Asserts that the type is an error union.
     pub fn errorUnionPayload(ty: Type, mod: *Module) Type {
-        return mod.intern_pool.indexToKey(ty.toIntern()).error_union_type.payload_type.toType();
+        return Type.fromInterned(mod.intern_pool.indexToKey(ty.toIntern()).error_union_type.payload_type);
     }
     /// Asserts that the type is an error union.
     pub fn errorUnionSet(ty: Type, mod: *Module) Type {
-        return mod.intern_pool.errorUnionSet(ty.toIntern()).toType();
+        return Type.fromInterned(mod.intern_pool.errorUnionSet(ty.toIntern()));
     }
     /// Returns false for unresolved inferred error sets.
 @@ -2077,8 +2082,8 @@ pub const Type = struct {
             .anon_struct_type,
             => null,
-            .array_type => |t| if (t.sentinel != .none) t.sentinel.toValue() else null,
+            .array_type => |t| if (t.sentinel != .none) Value.fromInterned(t.sentinel) else null,
-            .ptr_type => |t| if (t.sentinel != .none) t.sentinel.toValue() else null,
+            .ptr_type => |t| if (t.sentinel != .none) Value.fromInterned(t.sentinel) else null,
             else => unreachable,
         };
 @@ -2146,9 +2151,9 @@ pub const Type = struct {
             .c_ulonglong_type => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ulonglong) },
             else => switch (ip.indexToKey(ty.toIntern())) {
                 .int_type => |int_type| return int_type,
-                .struct_type => |t| ty = t.backingIntType(ip).*.toType(),
+                .struct_type => |t| ty = Type.fromInterned(t.backingIntType(ip).*),
-                .enum_type => |enum_type| ty = enum_type.tag_ty.toType(),
+                .enum_type => |enum_type| ty = Type.fromInterned(enum_type.tag_ty),
-                .vector_type => |vector_type| ty = vector_type.child.toType(),
+                .vector_type => |vector_type| ty = Type.fromInterned(vector_type.child),
                 .error_set_type, .inferred_error_set_type => {
                     return .{ .signedness = .unsigned, .bits = mod.errorSetBits() };
 @@ -2259,7 +2264,7 @@ pub const Type = struct {
     /// Asserts the type is a function or a function pointer.
     pub fn fnReturnType(ty: Type, mod: *Module) Type {
-        return mod.intern_pool.funcTypeReturnType(ty.toIntern()).toType();
+        return Type.fromInterned(mod.intern_pool.funcTypeReturnType(ty.toIntern()));
     }
     /// Asserts the type is a function.
 @@ -2343,15 +2348,15 @@ pub const Type = struct {
                 inline .array_type, .vector_type => |seq_type, seq_tag| {
                     const has_sentinel = seq_tag == .array_type and seq_type.sentinel != .none;
-                    if (seq_type.len + @intFromBool(has_sentinel) == 0) return (try mod.intern(.{ .aggregate = .{
+                    if (seq_type.len + @intFromBool(has_sentinel) == 0) return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                         .ty = ty.toIntern(),
                         .storage = .{ .elems = &.{} },
-                    } })).toValue();
+                    } })));
-                    if (try seq_type.child.toType().onePossibleValue(mod)) |opv| {
+                    if (try Type.fromInterned(seq_type.child).onePossibleValue(mod)) |opv| {
-                        return (try mod.intern(.{ .aggregate = .{
+                        return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                             .ty = ty.toIntern(),
                             .storage = .{ .repeated_elem = opv.toIntern() },
-                        } })).toValue();
+                        } })));
                     }
                     return null;
                 },
 @@ -2422,7 +2427,7 @@ pub const Type = struct {
                             field_val.* = struct_type.field_inits.get(ip)[i];
                             continue;
                         }
-                        const field_ty = struct_type.field_types.get(ip)[i].toType();
+                        const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
                         if (try field_ty.onePossibleValue(mod)) |field_opv| {
                             field_val.* = try field_opv.intern(field_ty, mod);
                         } else return null;
 @@ -2430,10 +2435,10 @@ pub const Type = struct {
                     // In this case the struct has no runtime-known fields and
                     // therefore has one possible value.
-                    return (try mod.intern(.{ .aggregate = .{
+                    return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                         .ty = ty.toIntern(),
                         .storage = .{ .elems = field_vals },
-                    } })).toValue();
+                    } })));
                 },
                 .anon_struct_type => |tuple| {
 @@ -2445,52 +2450,52 @@ pub const Type = struct {
                     // TODO: write something like getCoercedInts to avoid needing to dupe
                     const duped_values = try mod.gpa.dupe(InternPool.Index, tuple.values.get(ip));
                     defer mod.gpa.free(duped_values);
-                    return (try mod.intern(.{ .aggregate = .{
+                    return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                         .ty = ty.toIntern(),
                         .storage = .{ .elems = duped_values },
-                    } })).toValue();
+                    } })));
                 },
                 .union_type => |union_type| {
                     const union_obj = ip.loadUnionType(union_type);
-                    const tag_val = (try union_obj.enum_tag_ty.toType().onePossibleValue(mod)) orelse
+                    const tag_val = (try Type.fromInterned(union_obj.enum_tag_ty).onePossibleValue(mod)) orelse
                         return null;
                     if (union_obj.field_names.len == 0) {
                         const only = try mod.intern(.{ .empty_enum_value = ty.toIntern() });
-                        return only.toValue();
+                        return Value.fromInterned(only);
                     }
                     const only_field_ty = union_obj.field_types.get(ip)[0];
-                    const val_val = (try only_field_ty.toType().onePossibleValue(mod)) orelse
+                    const val_val = (try Type.fromInterned(only_field_ty).onePossibleValue(mod)) orelse
                         return null;
                     const only = try mod.intern(.{ .un = .{
                         .ty = ty.toIntern(),
                         .tag = tag_val.toIntern(),
                         .val = val_val.toIntern(),
                     } });
-                    return only.toValue();
+                    return Value.fromInterned(only);
                 },
                 .opaque_type => return null,
                 .enum_type => |enum_type| switch (enum_type.tag_mode) {
                     .nonexhaustive => {
                         if (enum_type.tag_ty == .comptime_int_type) return null;
-                        if (try enum_type.tag_ty.toType().onePossibleValue(mod)) |int_opv| {
+                        if (try Type.fromInterned(enum_type.tag_ty).onePossibleValue(mod)) |int_opv| {
                             const only = try mod.intern(.{ .enum_tag = .{
                                 .ty = ty.toIntern(),
                                 .int = int_opv.toIntern(),
                             } });
-                            return only.toValue();
+                            return Value.fromInterned(only);
                         }
                         return null;
                     },
                     .auto, .explicit => {
-                        if (enum_type.tag_ty.toType().hasRuntimeBits(mod)) return null;
+                        if (Type.fromInterned(enum_type.tag_ty).hasRuntimeBits(mod)) return null;
                         switch (enum_type.names.len) {
                             0 => {
                                 const only = try mod.intern(.{ .empty_enum_value = ty.toIntern() });
-                                return only.toValue();
+                                return Value.fromInterned(only);
                             },
                             1 => {
                                 if (enum_type.values.len == 0) {
 @@ -2501,9 +2506,9 @@ pub const Type = struct {
                                             .storage = .{ .u64 = 0 },
                                         } }),
                                     } });
-                                    return only.toValue();
+                                    return Value.fromInterned(only);
                                 } else {
-                                    return enum_type.values.get(ip)[0].toValue();
+                                    return Value.fromInterned(enum_type.values.get(ip)[0]);
                                 }
                             },
                             else => return null,
 @@ -2552,7 +2557,7 @@ pub const Type = struct {
             else => switch (ip.indexToKey(ty.toIntern())) {
                 .int_type => false,
                 .ptr_type => |ptr_type| {
-                    const child_ty = ptr_type.child.toType();
+                    const child_ty = Type.fromInterned(ptr_type.child);
                     switch (child_ty.zigTypeTag(mod)) {
                         .Fn => return !try child_ty.fnHasRuntimeBitsAdvanced(mod, opt_sema),
                         .Opaque => return false,
 @@ -2561,12 +2566,12 @@ pub const Type = struct {
                 },
                 .anyframe_type => |child| {
                     if (child == .none) return false;
-                    return child.toType().comptimeOnlyAdvanced(mod, opt_sema);
+                    return Type.fromInterned(child).comptimeOnlyAdvanced(mod, opt_sema);
                 },
-                .array_type => |array_type| return array_type.child.toType().comptimeOnlyAdvanced(mod, opt_sema),
+                .array_type => |array_type| return Type.fromInterned(array_type.child).comptimeOnlyAdvanced(mod, opt_sema),
-                .vector_type => |vector_type| return vector_type.child.toType().comptimeOnlyAdvanced(mod, opt_sema),
+                .vector_type => |vector_type| return Type.fromInterned(vector_type.child).comptimeOnlyAdvanced(mod, opt_sema),
-                .opt_type => |child| return child.toType().comptimeOnlyAdvanced(mod, opt_sema),
+                .opt_type => |child| return Type.fromInterned(child).comptimeOnlyAdvanced(mod, opt_sema),
-                .error_union_type => |error_union_type| return error_union_type.payload_type.toType().comptimeOnlyAdvanced(mod, opt_sema),
+                .error_union_type => |error_union_type| return Type.fromInterned(error_union_type.payload_type).comptimeOnlyAdvanced(mod, opt_sema),
                 .error_set_type,
                 .inferred_error_set_type,
 @@ -2647,7 +2652,7 @@ pub const Type = struct {
                                 const i: u32 = @intCast(i_usize);
                                 if (struct_type.fieldIsComptime(ip, i)) continue;
                                 const field_ty = struct_type.field_types.get(ip)[i];
-                                if (try field_ty.toType().comptimeOnlyAdvanced(mod, opt_sema)) {
+                                if (try Type.fromInterned(field_ty).comptimeOnlyAdvanced(mod, opt_sema)) {
                                     // Note that this does not cause the layout to
                                     // be considered resolved. Comptime-only types
                                     // still maintain a layout of their
 @@ -2666,7 +2671,7 @@ pub const Type = struct {
                 .anon_struct_type => |tuple| {
                     for (tuple.types.get(ip), tuple.values.get(ip)) |field_ty, val| {
                         const have_comptime_val = val != .none;
-                        if (!have_comptime_val and try field_ty.toType().comptimeOnlyAdvanced(mod, opt_sema)) return true;
+                        if (!have_comptime_val and try Type.fromInterned(field_ty).comptimeOnlyAdvanced(mod, opt_sema)) return true;
                     }
                     return false;
                 },
 @@ -2689,7 +2694,7 @@ pub const Type = struct {
                         const union_obj = ip.loadUnionType(union_type);
                         for (0..union_obj.field_types.len) |field_idx| {
                             const field_ty = union_obj.field_types.get(ip)[field_idx];
-                            if (try field_ty.toType().comptimeOnlyAdvanced(mod, opt_sema)) {
+                            if (try Type.fromInterned(field_ty).comptimeOnlyAdvanced(mod, opt_sema)) {
                                 union_obj.flagsPtr(ip).requires_comptime = .yes;
                                 return true;
                             }
 @@ -2702,7 +2707,7 @@ pub const Type = struct {
                 .opaque_type => false,
-                .enum_type => |enum_type| return enum_type.tag_ty.toType().comptimeOnlyAdvanced(mod, opt_sema),
+                .enum_type => |enum_type| return Type.fromInterned(enum_type.tag_ty).comptimeOnlyAdvanced(mod, opt_sema),
                 // values, not types
                 .undef,
 @@ -2792,10 +2797,10 @@ pub const Type = struct {
     // Works for vectors and vectors of integers.
     pub fn minInt(ty: Type, mod: *Module, dest_ty: Type) !Value {
         const scalar = try minIntScalar(ty.scalarType(mod), mod, dest_ty.scalarType(mod));
-        return if (ty.zigTypeTag(mod) == .Vector) (try mod.intern(.{ .aggregate = .{
+        return if (ty.zigTypeTag(mod) == .Vector) Value.fromInterned((try mod.intern(.{ .aggregate = .{
             .ty = dest_ty.toIntern(),
             .storage = .{ .repeated_elem = scalar.toIntern() },
-        } })).toValue() else scalar;
+        } }))) else scalar;
     }
     /// Asserts that the type is an integer.
 @@ -2821,10 +2826,10 @@ pub const Type = struct {
     /// The returned Value will have type dest_ty.
     pub fn maxInt(ty: Type, mod: *Module, dest_ty: Type) !Value {
         const scalar = try maxIntScalar(ty.scalarType(mod), mod, dest_ty.scalarType(mod));
-        return if (ty.zigTypeTag(mod) == .Vector) (try mod.intern(.{ .aggregate = .{
+        return if (ty.zigTypeTag(mod) == .Vector) Value.fromInterned((try mod.intern(.{ .aggregate = .{
             .ty = dest_ty.toIntern(),
             .storage = .{ .repeated_elem = scalar.toIntern() },
-        } })).toValue() else scalar;
+        } }))) else scalar;
     }
     /// The returned Value will have type dest_ty.
 @@ -2865,8 +2870,8 @@ pub const Type = struct {
     /// Asserts the type is an enum or a union.
     pub fn intTagType(ty: Type, mod: *Module) Type {
         return switch (mod.intern_pool.indexToKey(ty.toIntern())) {
-            .union_type => |union_type| union_type.enum_tag_ty.toType().intTagType(mod),
+            .union_type => |union_type| Type.fromInterned(union_type.enum_tag_ty).intTagType(mod),
-            .enum_type => |enum_type| enum_type.tag_ty.toType(),
+            .enum_type => |enum_type| Type.fromInterned(enum_type.tag_ty),
             else => unreachable,
         };
     }
 @@ -2965,12 +2970,12 @@ pub const Type = struct {
     pub fn structFieldType(ty: Type, index: usize, mod: *Module) Type {
         const ip = &mod.intern_pool;
         return switch (ip.indexToKey(ty.toIntern())) {
-            .struct_type => |struct_type| struct_type.field_types.get(ip)[index].toType(),
+            .struct_type => |struct_type| Type.fromInterned(struct_type.field_types.get(ip)[index]),
             .union_type => |union_type| {
                 const union_obj = ip.loadUnionType(union_type);
-                return union_obj.field_types.get(ip)[index].toType();
+                return Type.fromInterned(union_obj.field_types.get(ip)[index]);
             },
-            .anon_struct_type => |anon_struct| anon_struct.types.get(ip)[index].toType(),
+            .anon_struct_type => |anon_struct| Type.fromInterned(anon_struct.types.get(ip)[index]),
             else => unreachable,
         };
     }
 @@ -2981,11 +2986,11 @@ pub const Type = struct {
             .struct_type => |struct_type| {
                 assert(struct_type.layout != .Packed);
                 const explicit_align = struct_type.fieldAlign(ip, index);
-                const field_ty = struct_type.field_types.get(ip)[index].toType();
+                const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[index]);
                 return mod.structFieldAlignment(explicit_align, field_ty, struct_type.layout);
             },
             .anon_struct_type => |anon_struct| {
-                return anon_struct.types.get(ip)[index].toType().abiAlignment(mod);
+                return Type.fromInterned(anon_struct.types.get(ip)[index]).abiAlignment(mod);
             },
             .union_type => |union_type| {
                 const union_obj = ip.loadUnionType(union_type);
 @@ -3002,13 +3007,13 @@ pub const Type = struct {
                 const val = struct_type.fieldInit(ip, index);
                 // TODO: avoid using `unreachable` to indicate this.
                 if (val == .none) return Value.@"unreachable";
-                return val.toValue();
+                return Value.fromInterned(val);
             },
             .anon_struct_type => |anon_struct| {
                 const val = anon_struct.values.get(ip)[index];
                 // TODO: avoid using `unreachable` to indicate this.
                 if (val == .none) return Value.@"unreachable";
-                return val.toValue();
+                return Value.fromInterned(val);
             },
             else => unreachable,
         }
 @@ -3020,17 +3025,17 @@ pub const Type = struct {
             .struct_type => |struct_type| {
                 assert(struct_type.haveFieldInits(ip));
                 if (struct_type.fieldIsComptime(ip, index)) {
-                    return struct_type.field_inits.get(ip)[index].toValue();
+                    return Value.fromInterned(struct_type.field_inits.get(ip)[index]);
                 } else {
-                    return struct_type.field_types.get(ip)[index].toType().onePossibleValue(mod);
+                    return Type.fromInterned(struct_type.field_types.get(ip)[index]).onePossibleValue(mod);
                 }
             },
             .anon_struct_type => |tuple| {
                 const val = tuple.values.get(ip)[index];
                 if (val == .none) {
-                    return tuple.types.get(ip)[index].toType().onePossibleValue(mod);
+                    return Type.fromInterned(tuple.types.get(ip)[index]).onePossibleValue(mod);
                 } else {
-                    return val.toValue();
+                    return Value.fromInterned(val);
                 }
             },
             else => unreachable,
 @@ -3066,17 +3071,17 @@ pub const Type = struct {
                 var big_align: Alignment = .none;
                 for (tuple.types.get(ip), tuple.values.get(ip), 0..) |field_ty, field_val, i| {
-                    if (field_val != .none or !field_ty.toType().hasRuntimeBits(mod)) {
+                    if (field_val != .none or !Type.fromInterned(field_ty).hasRuntimeBits(mod)) {
                         // comptime field
                         if (i == index) return offset;
                         continue;
                     }
-                    const field_align = field_ty.toType().abiAlignment(mod);
+                    const field_align = Type.fromInterned(field_ty).abiAlignment(mod);
                     big_align = big_align.max(field_align);
                     offset = field_align.forward(offset);
                     if (i == index) return offset;
-                    offset += field_ty.toType().abiSize(mod);
+                    offset += Type.fromInterned(field_ty).abiSize(mod);
                 }
                 offset = big_align.max(.@"1").forward(offset);
                 return offset;

src/value.zig+284-277

 @@ -196,13 +196,13 @@ pub const Value = struct {
             .enum_literal => |enum_literal| enum_literal,
             .ptr => |ptr| switch (ptr.len) {
                 .none => unreachable,
-                else => try arrayToIpString(val, ptr.len.toValue().toUnsignedInt(mod), mod),
+                else => try arrayToIpString(val, Value.fromInterned(ptr.len).toUnsignedInt(mod), mod),
             },
             .aggregate => |aggregate| switch (aggregate.storage) {
                 .bytes => |bytes| try ip.getOrPutString(mod.gpa, bytes),
                 .elems => try arrayToIpString(val, ty.arrayLen(mod), mod),
                 .repeated_elem => |elem| {
-                    const byte = @as(u8, @intCast(elem.toValue().toUnsignedInt(mod)));
+                    const byte = @as(u8, @intCast(Value.fromInterned(elem).toUnsignedInt(mod)));
                     const len = @as(usize, @intCast(ty.arrayLen(mod)));
                     try ip.string_bytes.appendNTimes(mod.gpa, byte, len);
                     return ip.getOrPutTrailingString(mod.gpa, len);
 @@ -219,13 +219,13 @@ pub const Value = struct {
             .enum_literal => |enum_literal| allocator.dupe(u8, mod.intern_pool.stringToSlice(enum_literal)),
             .ptr => |ptr| switch (ptr.len) {
                 .none => unreachable,
-                else => try arrayToAllocatedBytes(val, ptr.len.toValue().toUnsignedInt(mod), allocator, mod),
+                else => try arrayToAllocatedBytes(val, Value.fromInterned(ptr.len).toUnsignedInt(mod), allocator, mod),
             },
             .aggregate => |aggregate| switch (aggregate.storage) {
                 .bytes => |bytes| try allocator.dupe(u8, bytes),
                 .elems => try arrayToAllocatedBytes(val, ty.arrayLen(mod), allocator, mod),
                 .repeated_elem => |elem| {
-                    const byte = @as(u8, @intCast(elem.toValue().toUnsignedInt(mod)));
+                    const byte = @as(u8, @intCast(Value.fromInterned(elem).toUnsignedInt(mod)));
                     const result = try allocator.alloc(u8, @as(usize, @intCast(ty.arrayLen(mod))));
                     @memset(result, byte);
                     return result;
 @@ -316,8 +316,8 @@ pub const Value = struct {
                 for (new_elems, old_elems, 0..) |*new_elem, old_elem, field_i|
                     new_elem.* = try old_elem.intern(switch (ty_key) {
                         .struct_type => ty.structFieldType(field_i, mod),
-                        .anon_struct_type => |info| info.types.get(ip)[field_i].toType(),
+                        .anon_struct_type => |info| Type.fromInterned(info.types.get(ip)[field_i]),
-                        inline .array_type, .vector_type => |info| info.child.toType(),
+                        inline .array_type, .vector_type => |info| Type.fromInterned(info.child),
                         else => unreachable,
                     }, mod);
                 return mod.intern(.{ .aggregate = .{
 @@ -378,42 +378,50 @@ pub const Value = struct {
             .error_union => |error_union| switch (error_union.val) {
                 .err_name => val,
-                .payload => |payload| Tag.eu_payload.create(arena, payload.toValue()),
+                .payload => |payload| Tag.eu_payload.create(arena, Value.fromInterned(payload)),
             },
             .ptr => |ptr| switch (ptr.len) {
                 .none => val,
                 else => |len| Tag.slice.create(arena, .{
                     .ptr = val.slicePtr(mod),
-                    .len = len.toValue(),
+                    .len = Value.fromInterned(len),
                 }),
             },
             .opt => |opt| switch (opt.val) {
                 .none => val,
-                else => |payload| Tag.opt_payload.create(arena, payload.toValue()),
+                else => |payload| Tag.opt_payload.create(arena, Value.fromInterned(payload)),
             },
             .aggregate => |aggregate| switch (aggregate.storage) {
                 .bytes => |bytes| Tag.bytes.create(arena, try arena.dupe(u8, bytes)),
                 .elems => |old_elems| {
                     const new_elems = try arena.alloc(Value, old_elems.len);
-                    for (new_elems, old_elems) |*new_elem, old_elem| new_elem.* = old_elem.toValue();
+                    for (new_elems, old_elems) |*new_elem, old_elem| new_elem.* = Value.fromInterned(old_elem);
                     return Tag.aggregate.create(arena, new_elems);
                 },
-                .repeated_elem => |elem| Tag.repeated.create(arena, elem.toValue()),
+                .repeated_elem => |elem| Tag.repeated.create(arena, Value.fromInterned(elem)),
             },
             .un => |un| Tag.@"union".create(arena, .{
                 // toValue asserts that the value cannot be .none which is valid on unions.
-                .tag = if (un.tag == .none) null else un.tag.toValue(),
+                .tag = if (un.tag == .none) null else Value.fromInterned(un.tag),
-                .val = un.val.toValue(),
+                .val = Value.fromInterned(un.val),
             }),
             .memoized_call => unreachable,
         };
     }
+    pub fn fromInterned(i: InternPool.Index) Value {
+        assert(i != .none);
+        return .{
+            .ip_index = i,
+            .legacy = undefined,
+        };
+    }
     pub fn toIntern(val: Value) InternPool.Index {
         assert(val.ip_index != .none);
         return val.ip_index;
 @@ -421,7 +429,7 @@ pub const Value = struct {
     /// Asserts that the value is representable as a type.
     pub fn toType(self: Value) Type {
-        return self.toIntern().toType();
+        return Type.fromInterned(self.toIntern());
     }
     pub fn intFromEnum(val: Value, ty: Type, mod: *Module) Allocator.Error!Value {
 @@ -435,13 +443,13 @@ pub const Value = struct {
                     // Assume it is already an integer and return it directly.
                     .simple_type, .int_type => val,
                     .enum_type => |enum_type| if (enum_type.values.len != 0)
-                        enum_type.values.get(ip)[field_index].toValue()
+                        Value.fromInterned(enum_type.values.get(ip)[field_index])
                     else // Field index and integer values are the same.
-                        mod.intValue(enum_type.tag_ty.toType(), field_index),
+                        mod.intValue(Type.fromInterned(enum_type.tag_ty), field_index),
                     else => unreachable,
                 };
             },
-            .enum_type => |enum_type| try mod.getCoerced(val, enum_type.tag_ty.toType()),
+            .enum_type => |enum_type| try mod.getCoerced(val, Type.fromInterned(enum_type.tag_ty)),
             else => unreachable,
         };
     }
 @@ -466,16 +474,16 @@ pub const Value = struct {
                 .int => |int| switch (int.storage) {
                     .u64, .i64, .big_int => int.storage.toBigInt(space),
                     .lazy_align, .lazy_size => |ty| {
-                        if (opt_sema) |sema| try sema.resolveTypeLayout(ty.toType());
+                        if (opt_sema) |sema| try sema.resolveTypeLayout(Type.fromInterned(ty));
                         const x = switch (int.storage) {
                             else => unreachable,
-                            .lazy_align => ty.toType().abiAlignment(mod).toByteUnits(0),
+                            .lazy_align => Type.fromInterned(ty).abiAlignment(mod).toByteUnits(0),
-                            .lazy_size => ty.toType().abiSize(mod),
+                            .lazy_size => Type.fromInterned(ty).abiSize(mod),
                         };
                         return BigIntMutable.init(&space.limbs, x).toConst();
                     },
                 },
-                .enum_tag => |enum_tag| enum_tag.int.toValue().toBigIntAdvanced(space, mod, opt_sema),
+                .enum_tag => |enum_tag| Value.fromInterned(enum_tag.int).toBigIntAdvanced(space, mod, opt_sema),
                 .opt, .ptr => BigIntMutable.init(
                     &space.limbs,
                     (try val.getUnsignedIntAdvanced(mod, opt_sema)).?,
 @@ -530,24 +538,24 @@ pub const Value = struct {
                     .u64 => |x| x,
                     .i64 => |x| std.math.cast(u64, x),
                     .lazy_align => |ty| if (opt_sema) |sema|
-                        (try ty.toType().abiAlignmentAdvanced(mod, .{ .sema = sema })).scalar.toByteUnits(0)
+                        (try Type.fromInterned(ty).abiAlignmentAdvanced(mod, .{ .sema = sema })).scalar.toByteUnits(0)
                     else
-                        ty.toType().abiAlignment(mod).toByteUnits(0),
+                        Type.fromInterned(ty).abiAlignment(mod).toByteUnits(0),
                     .lazy_size => |ty| if (opt_sema) |sema|
-                        (try ty.toType().abiSizeAdvanced(mod, .{ .sema = sema })).scalar
+                        (try Type.fromInterned(ty).abiSizeAdvanced(mod, .{ .sema = sema })).scalar
                     else
-                        ty.toType().abiSize(mod),
+                        Type.fromInterned(ty).abiSize(mod),
                 },
                 .ptr => |ptr| switch (ptr.addr) {
-                    .int => |int| int.toValue().getUnsignedIntAdvanced(mod, opt_sema),
+                    .int => |int| Value.fromInterned(int).getUnsignedIntAdvanced(mod, opt_sema),
                     .elem => |elem| {
-                        const base_addr = (try elem.base.toValue().getUnsignedIntAdvanced(mod, opt_sema)) orelse return null;
+                        const base_addr = (try Value.fromInterned(elem.base).getUnsignedIntAdvanced(mod, opt_sema)) orelse return null;
-                        const elem_ty = mod.intern_pool.typeOf(elem.base).toType().elemType2(mod);
+                        const elem_ty = Type.fromInterned(mod.intern_pool.typeOf(elem.base)).elemType2(mod);
                         return base_addr + elem.index * elem_ty.abiSize(mod);
                     },
                     .field => |field| {
-                        const base_addr = (try field.base.toValue().getUnsignedIntAdvanced(mod, opt_sema)) orelse return null;
+                        const base_addr = (try Value.fromInterned(field.base).getUnsignedIntAdvanced(mod, opt_sema)) orelse return null;
-                        const struct_ty = mod.intern_pool.typeOf(field.base).toType().childType(mod);
+                        const struct_ty = Type.fromInterned(mod.intern_pool.typeOf(field.base)).childType(mod);
                         if (opt_sema) |sema| try sema.resolveTypeLayout(struct_ty);
                         return base_addr + struct_ty.structFieldOffset(@as(usize, @intCast(field.index)), mod);
                     },
 @@ -555,7 +563,7 @@ pub const Value = struct {
                 },
                 .opt => |opt| switch (opt.val) {
                     .none => 0,
-                    else => |payload| payload.toValue().getUnsignedIntAdvanced(mod, opt_sema),
+                    else => |payload| Value.fromInterned(payload).getUnsignedIntAdvanced(mod, opt_sema),
                 },
                 else => null,
             },
 @@ -577,8 +585,8 @@ pub const Value = struct {
                     .big_int => |big_int| big_int.to(i64) catch unreachable,
                     .i64 => |x| x,
                     .u64 => |x| @intCast(x),
-                    .lazy_align => |ty| @intCast(ty.toType().abiAlignment(mod).toByteUnits(0)),
+                    .lazy_align => |ty| @intCast(Type.fromInterned(ty).abiAlignment(mod).toByteUnits(0)),
-                    .lazy_size => |ty| @intCast(ty.toType().abiSize(mod)),
+                    .lazy_size => |ty| @intCast(Type.fromInterned(ty).abiSize(mod)),
                 },
                 else => unreachable,
             },
 @@ -598,8 +606,8 @@ pub const Value = struct {
         while (true) switch (mod.intern_pool.indexToKey(check.toIntern())) {
             .ptr => |ptr| switch (ptr.addr) {
                 .decl, .mut_decl, .comptime_field, .anon_decl => return true,
-                .eu_payload, .opt_payload => |base| check = base.toValue(),
+                .eu_payload, .opt_payload => |base| check = Value.fromInterned(base),
-                .elem, .field => |base_index| check = base_index.base.toValue(),
+                .elem, .field => |base_index| check = Value.fromInterned(base_index.base),
                 .int => return false,
             },
             else => return false,
 @@ -680,16 +688,16 @@ pub const Value = struct {
                                 .repeated => val.castTag(.repeated).?.data,
                                 else => unreachable,
                             },
-                            else => switch (ip.indexToKey(val.toIntern()).aggregate.storage) {
+                            else => Value.fromInterned(switch (ip.indexToKey(val.toIntern()).aggregate.storage) {
                                 .bytes => |bytes| {
                                     buffer[off] = bytes[i];
                                     continue;
                                 },
                                 .elems => |elems| elems[i],
                                 .repeated_elem => |elem| elem,
-                            }.toValue(),
+                            }),
                         };
-                        const field_ty = struct_type.field_types.get(ip)[i].toType();
+                        const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
                         try writeToMemory(field_val, field_ty, mod, buffer[off..]);
                     },
                     .Packed => {
 @@ -720,7 +728,7 @@ pub const Value = struct {
                     if (val.unionTag(mod)) |union_tag| {
                         const union_obj = mod.typeToUnion(ty).?;
                         const field_index = mod.unionTagFieldIndex(union_obj, union_tag).?;
-                        const field_type = union_obj.field_types.get(&mod.intern_pool)[field_index].toType();
+                        const field_type = Type.fromInterned(union_obj.field_types.get(&mod.intern_pool)[field_index]);
                         const field_val = try val.fieldValue(mod, field_index);
                         const byte_count = @as(usize, @intCast(field_type.abiSize(mod)));
                         return writeToMemory(field_val, field_type, mod, buffer[0..byte_count]);
 @@ -829,14 +837,14 @@ pub const Value = struct {
                 var bits: u16 = 0;
                 const storage = ip.indexToKey(val.toIntern()).aggregate.storage;
                 for (0..struct_type.field_types.len) |i| {
-                    const field_ty = struct_type.field_types.get(ip)[i].toType();
+                    const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
                     const field_bits: u16 = @intCast(field_ty.bitSize(mod));
                     const field_val = switch (storage) {
                         .bytes => unreachable,
                         .elems => |elems| elems[i],
                         .repeated_elem => |elem| elem,
                     };
-                    try field_val.toValue().writeToPackedMemory(field_ty, mod, buffer, bit_offset + bits);
+                    try Value.fromInterned(field_val).writeToPackedMemory(field_ty, mod, buffer, bit_offset + bits);
                     bits += field_bits;
                 }
             },
 @@ -847,7 +855,7 @@ pub const Value = struct {
                     .Packed => {
                         if (val.unionTag(mod)) |union_tag| {
                             const field_index = mod.unionTagFieldIndex(union_obj, union_tag).?;
-                            const field_type = union_obj.field_types.get(ip)[field_index].toType();
+                            const field_type = Type.fromInterned(union_obj.field_types.get(ip)[field_index]);
                             const field_val = try val.fieldValue(mod, field_index);
                             return field_val.writeToPackedMemory(field_type, mod, buffer, bit_offset);
                         } else {
 @@ -934,7 +942,7 @@ pub const Value = struct {
                     return mod.getCoerced(try mod.intValue_big(int_ty, bigint.toConst()), ty);
                 }
             },
-            .Float => return (try mod.intern(.{ .float = .{
+            .Float => return Value.fromInterned((try mod.intern(.{ .float = .{
                 .ty = ty.toIntern(),
                 .storage = switch (ty.floatBits(target)) {
                     16 => .{ .f16 = @as(f16, @bitCast(std.mem.readInt(u16, buffer[0..2], endian))) },
 @@ -944,7 +952,7 @@ pub const Value = struct {
                     128 => .{ .f128 = @as(f128, @bitCast(std.mem.readInt(u128, buffer[0..16], endian))) },
                     else => unreachable,
                 },
-            } })).toValue(),
+            } }))),
             .Array => {
                 const elem_ty = ty.childType(mod);
                 const elem_size = elem_ty.abiSize(mod);
 @@ -954,10 +962,10 @@ pub const Value = struct {
                     elem.* = try (try readFromMemory(elem_ty, mod, buffer[offset..], arena)).intern(elem_ty, mod);
                     offset += @as(usize, @intCast(elem_size));
                 }
-                return (try mod.intern(.{ .aggregate = .{
+                return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = ty.toIntern(),
                     .storage = .{ .elems = elems },
-                } })).toValue();
+                } })));
             },
             .Vector => {
                 // We use byte_count instead of abi_size here, so that any padding bytes
 @@ -973,15 +981,15 @@ pub const Value = struct {
                         const field_types = struct_type.field_types;
                         const field_vals = try arena.alloc(InternPool.Index, field_types.len);
                         for (field_vals, 0..) |*field_val, i| {
-                            const field_ty = field_types.get(ip)[i].toType();
+                            const field_ty = Type.fromInterned(field_types.get(ip)[i]);
                             const off: usize = @intCast(ty.structFieldOffset(i, mod));
                             const sz: usize = @intCast(field_ty.abiSize(mod));
                             field_val.* = try (try readFromMemory(field_ty, mod, buffer[off..(off + sz)], arena)).intern(field_ty, mod);
                         }
-                        return (try mod.intern(.{ .aggregate = .{
+                        return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                             .ty = ty.toIntern(),
                             .storage = .{ .elems = field_vals },
-                        } })).toValue();
+                        } })));
                     },
                     .Packed => {
                         const byte_count = (@as(usize, @intCast(ty.bitSize(mod))) + 7) / 8;
 @@ -996,10 +1004,10 @@ pub const Value = struct {
                 const index = (int << @as(u6, @intCast(64 - bits))) >> @as(u6, @intCast(64 - bits));
                 const name = mod.global_error_set.keys()[@intCast(index)];
-                return (try mod.intern(.{ .err = .{
+                return Value.fromInterned((try mod.intern(.{ .err = .{
                     .ty = ty.toIntern(),
                     .name = name,
-                } })).toValue();
+                } })));
             },
             .Union => switch (ty.containerLayout(mod)) {
                 .Auto => return error.IllDefinedMemoryLayout,
 @@ -1007,11 +1015,11 @@ pub const Value = struct {
                     const union_size = ty.abiSize(mod);
                     const array_ty = try mod.arrayType(.{ .len = union_size, .child = .u8_type });
                     const val = try (try readFromMemory(array_ty, mod, buffer, arena)).intern(array_ty, mod);
-                    return (try mod.intern(.{ .un = .{
+                    return Value.fromInterned((try mod.intern(.{ .un = .{
                         .ty = ty.toIntern(),
                         .tag = .none,
                         .val = val,
-                    } })).toValue();
+                    } })));
                 },
                 .Packed => {
                     const byte_count = (@as(usize, @intCast(ty.bitSize(mod))) + 7) / 8;
 @@ -1021,23 +1029,23 @@ pub const Value = struct {
             .Pointer => {
                 assert(!ty.isSlice(mod)); // No well defined layout.
                 const int_val = try readFromMemory(Type.usize, mod, buffer, arena);
-                return (try mod.intern(.{ .ptr = .{
+                return Value.fromInterned((try mod.intern(.{ .ptr = .{
                     .ty = ty.toIntern(),
                     .addr = .{ .int = int_val.toIntern() },
-                } })).toValue();
+                } })));
             },
             .Optional => {
                 assert(ty.isPtrLikeOptional(mod));
                 const child_ty = ty.optionalChild(mod);
                 const child_val = try readFromMemory(child_ty, mod, buffer, arena);
-                return (try mod.intern(.{ .opt = .{
+                return Value.fromInterned((try mod.intern(.{ .opt = .{
                     .ty = ty.toIntern(),
                     .val = switch (child_val.orderAgainstZero(mod)) {
                         .lt => unreachable,
                         .eq => .none,
                         .gt => child_val.toIntern(),
                     },
-                } })).toValue();
+                } })));
             },
             else => return error.Unimplemented,
         }
 @@ -1108,7 +1116,7 @@ pub const Value = struct {
                 bigint.readPackedTwosComplement(buffer, bit_offset, bits, endian, int_info.signedness);
                 return mod.intValue_big(ty, bigint.toConst());
             },
-            .Float => return (try mod.intern(.{ .float = .{
+            .Float => return Value.fromInterned((try mod.intern(.{ .float = .{
                 .ty = ty.toIntern(),
                 .storage = switch (ty.floatBits(target)) {
                     16 => .{ .f16 = @as(f16, @bitCast(std.mem.readPackedInt(u16, buffer, bit_offset, endian))) },
 @@ -1118,7 +1126,7 @@ pub const Value = struct {
                     128 => .{ .f128 = @as(f128, @bitCast(std.mem.readPackedInt(u128, buffer, bit_offset, endian))) },
                     else => unreachable,
                 },
-            } })).toValue(),
+            } }))),
             .Vector => {
                 const elem_ty = ty.childType(mod);
                 const elems = try arena.alloc(InternPool.Index, @as(usize, @intCast(ty.arrayLen(mod))));
 @@ -1131,10 +1139,10 @@ pub const Value = struct {
                     elems[tgt_elem_i] = try (try readFromPackedMemory(elem_ty, mod, buffer, bit_offset + bits, arena)).intern(elem_ty, mod);
                     bits += elem_bit_size;
                 }
-                return (try mod.intern(.{ .aggregate = .{
+                return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = ty.toIntern(),
                     .storage = .{ .elems = elems },
-                } })).toValue();
+                } })));
             },
             .Struct => {
                 // Sema is supposed to have emitted a compile error already for Auto layout structs,
 @@ -1143,26 +1151,26 @@ pub const Value = struct {
                 var bits: u16 = 0;
                 const field_vals = try arena.alloc(InternPool.Index, struct_type.field_types.len);
                 for (field_vals, 0..) |*field_val, i| {
-                    const field_ty = struct_type.field_types.get(ip)[i].toType();
+                    const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[i]);
                     const field_bits: u16 = @intCast(field_ty.bitSize(mod));
                     field_val.* = try (try readFromPackedMemory(field_ty, mod, buffer, bit_offset + bits, arena)).intern(field_ty, mod);
                     bits += field_bits;
                 }
-                return (try mod.intern(.{ .aggregate = .{
+                return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = ty.toIntern(),
                     .storage = .{ .elems = field_vals },
-                } })).toValue();
+                } })));
             },
             .Union => switch (ty.containerLayout(mod)) {
                 .Auto, .Extern => unreachable, // Handled by non-packed readFromMemory
                 .Packed => {
                     const backing_ty = try ty.unionBackingType(mod);
                     const val = (try readFromPackedMemory(backing_ty, mod, buffer, bit_offset, arena)).toIntern();
-                    return (try mod.intern(.{ .un = .{
+                    return Value.fromInterned((try mod.intern(.{ .un = .{
                         .ty = ty.toIntern(),
                         .tag = .none,
                         .val = val,
-                    } })).toValue();
+                    } })));
                 },
             },
             .Pointer => {
 @@ -1189,8 +1197,8 @@ pub const Value = struct {
                     }
                     return @floatFromInt(x);
                 },
-                .lazy_align => |ty| @floatFromInt(ty.toType().abiAlignment(mod).toByteUnits(0)),
+                .lazy_align => |ty| @floatFromInt(Type.fromInterned(ty).abiAlignment(mod).toByteUnits(0)),
-                .lazy_size => |ty| @floatFromInt(ty.toType().abiSize(mod)),
+                .lazy_size => |ty| @floatFromInt(Type.fromInterned(ty).abiSize(mod)),
             },
             .float => |float| switch (float.storage) {
                 inline else => |x| @floatCast(x),
 @@ -1283,7 +1291,7 @@ pub const Value = struct {
     /// Caller can find out by equality checking the result against the operand.
     pub fn floatCast(self: Value, dest_ty: Type, mod: *Module) !Value {
         const target = mod.getTarget();
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = dest_ty.toIntern(),
             .storage = switch (dest_ty.floatBits(target)) {
                 16 => .{ .f16 = self.toFloat(f16, mod) },
 @@ -1293,7 +1301,7 @@ pub const Value = struct {
                 128 => .{ .f128 = self.toFloat(f128, mod) },
                 else => unreachable,
             },
-        } })).toValue();
+        } })));
     }
     /// Asserts the value is a float
 @@ -1321,8 +1329,8 @@ pub const Value = struct {
             else => switch (mod.intern_pool.indexToKey(lhs.toIntern())) {
                 .ptr => |ptr| switch (ptr.addr) {
                     .decl, .mut_decl, .comptime_field => .gt,
-                    .int => |int| int.toValue().orderAgainstZeroAdvanced(mod, opt_sema),
+                    .int => |int| Value.fromInterned(int).orderAgainstZeroAdvanced(mod, opt_sema),
-                    .elem => |elem| switch (try elem.base.toValue().orderAgainstZeroAdvanced(mod, opt_sema)) {
+                    .elem => |elem| switch (try Value.fromInterned(elem.base).orderAgainstZeroAdvanced(mod, opt_sema)) {
                         .lt => unreachable,
                         .gt => .gt,
                         .eq => if (elem.index == 0) .eq else .gt,
 @@ -1333,7 +1341,7 @@ pub const Value = struct {
                     .big_int => |big_int| big_int.orderAgainstScalar(0),
                     inline .u64, .i64 => |x| std.math.order(x, 0),
                     .lazy_align => .gt, // alignment is never 0
-                    .lazy_size => |ty| return if (ty.toType().hasRuntimeBitsAdvanced(
+                    .lazy_size => |ty| return if (Type.fromInterned(ty).hasRuntimeBitsAdvanced(
                         mod,
                         false,
                         if (opt_sema) |sema| .{ .sema = sema } else .eager,
 @@ -1342,7 +1350,7 @@ pub const Value = struct {
                         else => |e| return e,
                     }) .gt else .eq,
                 },
-                .enum_tag => |enum_tag| enum_tag.int.toValue().orderAgainstZeroAdvanced(mod, opt_sema),
+                .enum_tag => |enum_tag| Value.fromInterned(enum_tag.int).orderAgainstZeroAdvanced(mod, opt_sema),
                 .float => |float| switch (float.storage) {
                     inline else => |x| std.math.order(x, 0),
                 },
 @@ -1494,9 +1502,9 @@ pub const Value = struct {
                     if (!std.math.order(byte, 0).compare(op)) break false;
                 } else true,
                 .elems => |elems| for (elems) |elem| {
-                    if (!try elem.toValue().compareAllWithZeroAdvancedExtra(op, mod, opt_sema)) break false;
+                    if (!try Value.fromInterned(elem).compareAllWithZeroAdvancedExtra(op, mod, opt_sema)) break false;
                 } else true,
-                .repeated_elem => |elem| elem.toValue().compareAllWithZeroAdvancedExtra(op, mod, opt_sema),
+                .repeated_elem => |elem| Value.fromInterned(elem).compareAllWithZeroAdvancedExtra(op, mod, opt_sema),
             },
             else => {},
         }
 @@ -1513,8 +1521,8 @@ pub const Value = struct {
         return switch (mod.intern_pool.indexToKey(val.toIntern())) {
             .ptr => |ptr| switch (ptr.addr) {
                 .mut_decl, .comptime_field => true,
-                .eu_payload, .opt_payload => |base_ptr| base_ptr.toValue().isComptimeMutablePtr(mod),
+                .eu_payload, .opt_payload => |base_ptr| Value.fromInterned(base_ptr).isComptimeMutablePtr(mod),
-                .elem, .field => |base_index| base_index.base.toValue().isComptimeMutablePtr(mod),
+                .elem, .field => |base_index| Value.fromInterned(base_index.base).isComptimeMutablePtr(mod),
                 else => false,
             },
             else => false,
 @@ -1526,20 +1534,20 @@ pub const Value = struct {
             else => switch (mod.intern_pool.indexToKey(val.toIntern())) {
                 .error_union => |error_union| switch (error_union.val) {
                     .err_name => false,
-                    .payload => |payload| payload.toValue().canMutateComptimeVarState(mod),
+                    .payload => |payload| Value.fromInterned(payload).canMutateComptimeVarState(mod),
                 },
                 .ptr => |ptr| switch (ptr.addr) {
-                    .eu_payload, .opt_payload => |base| base.toValue().canMutateComptimeVarState(mod),
+                    .eu_payload, .opt_payload => |base| Value.fromInterned(base).canMutateComptimeVarState(mod),
                     else => false,
                 },
                 .opt => |opt| switch (opt.val) {
                     .none => false,
-                    else => |payload| payload.toValue().canMutateComptimeVarState(mod),
+                    else => |payload| Value.fromInterned(payload).canMutateComptimeVarState(mod),
                 },
                 .aggregate => |aggregate| for (aggregate.storage.values()) |elem| {
-                    if (elem.toValue().canMutateComptimeVarState(mod)) break true;
+                    if (Value.fromInterned(elem).canMutateComptimeVarState(mod)) break true;
                 } else false,
-                .un => |un| un.val.toValue().canMutateComptimeVarState(mod),
+                .un => |un| Value.fromInterned(un.val).canMutateComptimeVarState(mod),
                 else => false,
             },
         };
 @@ -1566,7 +1574,7 @@ pub const Value = struct {
     pub const slice_len_index = 1;
     pub fn slicePtr(val: Value, mod: *Module) Value {
-        return mod.intern_pool.slicePtr(val.toIntern()).toValue();
+        return Value.fromInterned(mod.intern_pool.slicePtr(val.toIntern()));
     }
     pub fn sliceLen(val: Value, mod: *Module) u64 {
 @@ -1583,7 +1591,7 @@ pub const Value = struct {
                 .array_type => |array_type| array_type.len,
                 else => 1,
             },
-            else => ptr.len.toValue().toUnsignedInt(mod),
+            else => Value.fromInterned(ptr.len).toUnsignedInt(mod),
         };
     }
 @@ -1604,37 +1612,36 @@ pub const Value = struct {
                 else => null,
             },
             else => switch (mod.intern_pool.indexToKey(val.toIntern())) {
-                .undef => |ty| (try mod.intern(.{
+                .undef => |ty| Value.fromInterned((try mod.intern(.{
-                    .undef = ty.toType().elemType2(mod).toIntern(),
+                    .undef = Type.fromInterned(ty).elemType2(mod).toIntern(),
-                })).toValue(),
+                }))),
                 .ptr => |ptr| switch (ptr.addr) {
                     .decl => |decl| mod.declPtr(decl).val.maybeElemValue(mod, index),
-                    .anon_decl => |anon_decl| anon_decl.val.toValue().maybeElemValue(mod, index),
+                    .anon_decl => |anon_decl| Value.fromInterned(anon_decl.val).maybeElemValue(mod, index),
-                    .mut_decl => |mut_decl| (try mod.declPtr(mut_decl.decl).internValue(mod))
+                    .mut_decl => |mut_decl| Value.fromInterned((try mod.declPtr(mut_decl.decl).internValue(mod))).maybeElemValue(mod, index),
-                        .toValue().maybeElemValue(mod, index),
                     .int, .eu_payload => null,
-                    .opt_payload => |base| base.toValue().maybeElemValue(mod, index),
+                    .opt_payload => |base| Value.fromInterned(base).maybeElemValue(mod, index),
-                    .comptime_field => |field_val| field_val.toValue().maybeElemValue(mod, index),
+                    .comptime_field => |field_val| Value.fromInterned(field_val).maybeElemValue(mod, index),
-                    .elem => |elem| elem.base.toValue().maybeElemValue(mod, index + @as(usize, @intCast(elem.index))),
+                    .elem => |elem| Value.fromInterned(elem.base).maybeElemValue(mod, index + @as(usize, @intCast(elem.index))),
-                    .field => |field| if (field.base.toValue().pointerDecl(mod)) |decl_index| {
+                    .field => |field| if (Value.fromInterned(field.base).pointerDecl(mod)) |decl_index| {
                         const base_decl = mod.declPtr(decl_index);
                         const field_val = try base_decl.val.fieldValue(mod, @as(usize, @intCast(field.index)));
                         return field_val.maybeElemValue(mod, index);
                     } else null,
                 },
-                .opt => |opt| opt.val.toValue().maybeElemValue(mod, index),
+                .opt => |opt| Value.fromInterned(opt.val).maybeElemValue(mod, index),
                 .aggregate => |aggregate| {
                     const len = mod.intern_pool.aggregateTypeLen(aggregate.ty);
-                    if (index < len) return switch (aggregate.storage) {
+                    if (index < len) return Value.fromInterned(switch (aggregate.storage) {
                         .bytes => |bytes| try mod.intern(.{ .int = .{
                             .ty = .u8_type,
                             .storage = .{ .u64 = bytes[index] },
                         } }),
                         .elems => |elems| elems[index],
                         .repeated_elem => |elem| elem,
-                    }.toValue();
+                    });
                     assert(index == len);
-                    return mod.intern_pool.indexToKey(aggregate.ty).array_type.sentinel.toValue();
+                    return Value.fromInterned(mod.intern_pool.indexToKey(aggregate.ty).array_type.sentinel);
                 },
                 else => null,
             },
 @@ -1681,15 +1688,15 @@ pub const Value = struct {
             else => switch (mod.intern_pool.indexToKey(val.toIntern())) {
                 .ptr => |ptr| switch (ptr.addr) {
                     .decl => |decl| try mod.declPtr(decl).val.sliceArray(mod, arena, start, end),
-                    .mut_decl => |mut_decl| (try mod.declPtr(mut_decl.decl).internValue(mod)).toValue()
+                    .mut_decl => |mut_decl| Value.fromInterned((try mod.declPtr(mut_decl.decl).internValue(mod)))
                         .sliceArray(mod, arena, start, end),
-                    .comptime_field => |comptime_field| comptime_field.toValue()
+                    .comptime_field => |comptime_field| Value.fromInterned(comptime_field)
                         .sliceArray(mod, arena, start, end),
-                    .elem => |elem| elem.base.toValue()
+                    .elem => |elem| Value.fromInterned(elem.base)
                         .sliceArray(mod, arena, start + @as(usize, @intCast(elem.index)), end + @as(usize, @intCast(elem.index))),
                     else => unreachable,
                 },
-                .aggregate => |aggregate| (try mod.intern(.{ .aggregate = .{
+                .aggregate => |aggregate| Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = switch (mod.intern_pool.indexToKey(mod.intern_pool.typeOf(val.toIntern()))) {
                         .array_type => |array_type| try mod.arrayType(.{
                             .len = @as(u32, @intCast(end - start)),
 @@ -1707,7 +1714,7 @@ pub const Value = struct {
                         .elems => .{ .elems = try arena.dupe(InternPool.Index, mod.intern_pool.indexToKey(val.toIntern()).aggregate.storage.elems[start..end]) },
                         .repeated_elem => |elem| .{ .repeated_elem = elem },
                     },
-                } })).toValue(),
+                } }))),
                 else => unreachable,
             },
         };
 @@ -1728,19 +1735,19 @@ pub const Value = struct {
                 else => unreachable,
             },
             else => switch (mod.intern_pool.indexToKey(val.toIntern())) {
-                .undef => |ty| (try mod.intern(.{
+                .undef => |ty| Value.fromInterned((try mod.intern(.{
-                    .undef = ty.toType().structFieldType(index, mod).toIntern(),
+                    .undef = Type.fromInterned(ty).structFieldType(index, mod).toIntern(),
-                })).toValue(),
+                }))),
-                .aggregate => |aggregate| switch (aggregate.storage) {
+                .aggregate => |aggregate| Value.fromInterned(switch (aggregate.storage) {
                     .bytes => |bytes| try mod.intern(.{ .int = .{
                         .ty = .u8_type,
                         .storage = .{ .u64 = bytes[index] },
                     } }),
                     .elems => |elems| elems[index],
                     .repeated_elem => |elem| elem,
-                }.toValue(),
+                }),
                 // TODO assert the tag is correct
-                .un => |un| un.val.toValue(),
+                .un => |un| Value.fromInterned(un.val),
                 else => unreachable,
             },
         };
 @@ -1750,7 +1757,7 @@ pub const Value = struct {
         if (val.ip_index == .none) return val.castTag(.@"union").?.data.tag;
         return switch (mod.intern_pool.indexToKey(val.toIntern())) {
             .undef, .enum_tag => val,
-            .un => |un| if (un.tag != .none) un.tag.toValue() else return null,
+            .un => |un| if (un.tag != .none) Value.fromInterned(un.tag) else return null,
             else => unreachable,
         };
     }
 @@ -1758,7 +1765,7 @@ pub const Value = struct {
     pub fn unionValue(val: Value, mod: *Module) Value {
         if (val.ip_index == .none) return val.castTag(.@"union").?.data.val;
         return switch (mod.intern_pool.indexToKey(val.toIntern())) {
-            .un => |un| un.val.toValue(),
+            .un => |un| Value.fromInterned(un.val),
             else => unreachable,
         };
     }
 @@ -1774,14 +1781,14 @@ pub const Value = struct {
         const ptr_val = switch (mod.intern_pool.indexToKey(val.toIntern())) {
             .ptr => |ptr| ptr: {
                 switch (ptr.addr) {
-                    .elem => |elem| if (mod.intern_pool.typeOf(elem.base).toType().elemType2(mod).eql(elem_ty, mod))
+                    .elem => |elem| if (Type.fromInterned(mod.intern_pool.typeOf(elem.base)).elemType2(mod).eql(elem_ty, mod))
-                        return (try mod.intern(.{ .ptr = .{
+                        return Value.fromInterned((try mod.intern(.{ .ptr = .{
                             .ty = elem_ptr_ty.toIntern(),
                             .addr = .{ .elem = .{
                                 .base = elem.base,
                                 .index = elem.index + index,
                             } },
-                        } })).toValue(),
+                        } }))),
                     else => {},
                 }
                 break :ptr switch (ptr.len) {
 @@ -1794,13 +1801,13 @@ pub const Value = struct {
         var ptr_ty_key = mod.intern_pool.indexToKey(elem_ptr_ty.toIntern()).ptr_type;
         assert(ptr_ty_key.flags.size != .Slice);
         ptr_ty_key.flags.size = .Many;
-        return (try mod.intern(.{ .ptr = .{
+        return Value.fromInterned((try mod.intern(.{ .ptr = .{
             .ty = elem_ptr_ty.toIntern(),
             .addr = .{ .elem = .{
                 .base = (try mod.getCoerced(ptr_val, try mod.ptrType(ptr_ty_key))).toIntern(),
                 .index = index,
             } },
-        } })).toValue();
+        } })));
     }
     pub fn isUndef(val: Value, mod: *Module) bool {
 @@ -1824,13 +1831,13 @@ pub const Value = struct {
                 .simple_value => |v| v == .undefined,
                 .ptr => |ptr| switch (ptr.len) {
                     .none => false,
-                    else => for (0..@as(usize, @intCast(ptr.len.toValue().toUnsignedInt(mod)))) |index| {
+                    else => for (0..@as(usize, @intCast(Value.fromInterned(ptr.len).toUnsignedInt(mod)))) |index| {
                         if (try (try val.elemValue(mod, index)).anyUndef(mod)) break true;
                     } else false,
                 },
                 .aggregate => |aggregate| for (0..aggregate.storage.values().len) |i| {
                     const elem = mod.intern_pool.indexToKey(val.toIntern()).aggregate.storage.values()[i];
-                    if (try anyUndef(elem.toValue(), mod)) break true;
+                    if (try anyUndef(Value.fromInterned(elem), mod)) break true;
                 } else false,
                 else => false,
             },
 @@ -1889,7 +1896,7 @@ pub const Value = struct {
         return switch (mod.intern_pool.indexToKey(val.toIntern())) {
             .opt => |opt| switch (opt.val) {
                 .none => null,
-                else => |payload| payload.toValue(),
+                else => |payload| Value.fromInterned(payload),
             },
             .ptr => val,
             else => unreachable,
 @@ -1923,10 +1930,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try floatFromIntScalar(elem_val, scalar_ty, mod, opt_sema)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatFromIntScalar(val, float_ty, mod, opt_sema);
     }
 @@ -1941,14 +1948,14 @@ pub const Value = struct {
                 },
                 inline .u64, .i64 => |x| floatFromIntInner(x, float_ty, mod),
                 .lazy_align => |ty| if (opt_sema) |sema| {
-                    return floatFromIntInner((try ty.toType().abiAlignmentAdvanced(mod, .{ .sema = sema })).scalar.toByteUnits(0), float_ty, mod);
+                    return floatFromIntInner((try Type.fromInterned(ty).abiAlignmentAdvanced(mod, .{ .sema = sema })).scalar.toByteUnits(0), float_ty, mod);
                 } else {
-                    return floatFromIntInner(ty.toType().abiAlignment(mod).toByteUnits(0), float_ty, mod);
+                    return floatFromIntInner(Type.fromInterned(ty).abiAlignment(mod).toByteUnits(0), float_ty, mod);
                 },
                 .lazy_size => |ty| if (opt_sema) |sema| {
-                    return floatFromIntInner((try ty.toType().abiSizeAdvanced(mod, .{ .sema = sema })).scalar, float_ty, mod);
+                    return floatFromIntInner((try Type.fromInterned(ty).abiSizeAdvanced(mod, .{ .sema = sema })).scalar, float_ty, mod);
                 } else {
-                    return floatFromIntInner(ty.toType().abiSize(mod), float_ty, mod);
+                    return floatFromIntInner(Type.fromInterned(ty).abiSize(mod), float_ty, mod);
                 },
             },
             else => unreachable,
 @@ -1965,10 +1972,10 @@ pub const Value = struct {
             128 => .{ .f128 = @floatFromInt(x) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = dest_ty.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     fn calcLimbLenFloat(scalar: anytype) usize {
 @@ -2001,10 +2008,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try intAddSatScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intAddSatScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -2051,10 +2058,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try intSubSatScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intSubSatScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -2105,14 +2112,14 @@ pub const Value = struct {
                 scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);
             }
             return OverflowArithmeticResult{
-                .overflow_bit = (try mod.intern(.{ .aggregate = .{
+                .overflow_bit = Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),
                     .storage = .{ .elems = overflowed_data },
-                } })).toValue(),
+                } }))),
-                .wrapped_result = (try mod.intern(.{ .aggregate = .{
+                .wrapped_result = Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = ty.toIntern(),
                     .storage = .{ .elems = result_data },
-                } })).toValue(),
+                } }))),
             };
         }
         return intMulWithOverflowScalar(lhs, rhs, ty, arena, mod);
 @@ -2169,10 +2176,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try numberMulWrapScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return numberMulWrapScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -2215,10 +2222,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try intMulSatScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intMulSatScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -2291,17 +2298,17 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try bitwiseNotScalar(elem_val, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return bitwiseNotScalar(val, ty, arena, mod);
     }
     /// operands must be integers; handles undefined.
     pub fn bitwiseNotScalar(val: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
-        if (val.isUndef(mod)) return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();
+        if (val.isUndef(mod)) return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
         if (ty.toIntern() == .bool_type) return makeBool(!val.toBool());
         const info = ty.intInfo(mod);
 @@ -2334,17 +2341,17 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try bitwiseAndScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return bitwiseAndScalar(lhs, rhs, ty, allocator, mod);
     }
     /// operands must be integers; handles undefined.
     pub fn bitwiseAndScalar(lhs: Value, rhs: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
-        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();
+        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
         if (ty.toIntern() == .bool_type) return makeBool(lhs.toBool() and rhs.toBool());
         // TODO is this a performance issue? maybe we should try the operation without
 @@ -2373,17 +2380,17 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try bitwiseNandScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return bitwiseNandScalar(lhs, rhs, ty, arena, mod);
     }
     /// operands must be integers; handles undefined.
     pub fn bitwiseNandScalar(lhs: Value, rhs: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
-        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();
+        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
         if (ty.toIntern() == .bool_type) return makeBool(!(lhs.toBool() and rhs.toBool()));
         const anded = try bitwiseAnd(lhs, rhs, ty, arena, mod);
 @@ -2401,17 +2408,17 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try bitwiseOrScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return bitwiseOrScalar(lhs, rhs, ty, allocator, mod);
     }
     /// operands must be integers; handles undefined.
     pub fn bitwiseOrScalar(lhs: Value, rhs: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
-        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();
+        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
         if (ty.toIntern() == .bool_type) return makeBool(lhs.toBool() or rhs.toBool());
         // TODO is this a performance issue? maybe we should try the operation without
 @@ -2439,17 +2446,17 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try bitwiseXorScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return bitwiseXorScalar(lhs, rhs, ty, allocator, mod);
     }
     /// operands must be integers; handles undefined.
     pub fn bitwiseXorScalar(lhs: Value, rhs: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
-        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return (try mod.intern(.{ .undef = ty.toIntern() })).toValue();
+        if (lhs.isUndef(mod) or rhs.isUndef(mod)) return Value.fromInterned((try mod.intern(.{ .undef = ty.toIntern() })));
         if (ty.toIntern() == .bool_type) return makeBool(lhs.toBool() != rhs.toBool());
         // TODO is this a performance issue? maybe we should try the operation without
 @@ -2505,10 +2512,10 @@ pub const Value = struct {
                 };
                 scalar.* = try val.intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intDivScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -2553,10 +2560,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try intDivFloorScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intDivFloorScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -2595,10 +2602,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try intModScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intModScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -2669,10 +2676,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatRemScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatRemScalar(lhs, rhs, float_type, mod);
     }
 @@ -2687,10 +2694,10 @@ pub const Value = struct {
             128 => .{ .f128 = @rem(lhs.toFloat(f128, mod), rhs.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatMod(lhs: Value, rhs: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -2702,10 +2709,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatModScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatModScalar(lhs, rhs, float_type, mod);
     }
 @@ -2720,10 +2727,10 @@ pub const Value = struct {
             128 => .{ .f128 = @mod(lhs.toFloat(f128, mod), rhs.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     /// If the value overflowed the type, returns a comptime_int (or vector thereof) instead, setting
 @@ -2763,10 +2770,10 @@ pub const Value = struct {
                 };
                 scalar.* = try val.intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intMulScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -2805,10 +2812,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try intTruncScalar(elem_val, scalar_ty, allocator, signedness, bits, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intTruncScalar(val, ty, allocator, signedness, bits, mod);
     }
 @@ -2830,10 +2837,10 @@ pub const Value = struct {
                 const bits_elem = try bits.elemValue(mod, i);
                 scalar.* = try (try intTruncScalar(elem_val, scalar_ty, allocator, signedness, @as(u16, @intCast(bits_elem.toUnsignedInt(mod))), mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return intTruncScalar(val, ty, allocator, signedness, @as(u16, @intCast(bits.toUnsignedInt(mod))), mod);
     }
 @@ -2870,10 +2877,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try shlScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return shlScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -2922,14 +2929,14 @@ pub const Value = struct {
                 scalar.* = try of_math_result.wrapped_result.intern(scalar_ty, mod);
             }
             return OverflowArithmeticResult{
-                .overflow_bit = (try mod.intern(.{ .aggregate = .{
+                .overflow_bit = Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = (try mod.vectorType(.{ .len = vec_len, .child = .u1_type })).toIntern(),
                     .storage = .{ .elems = overflowed_data },
-                } })).toValue(),
+                } }))),
-                .wrapped_result = (try mod.intern(.{ .aggregate = .{
+                .wrapped_result = Value.fromInterned((try mod.intern(.{ .aggregate = .{
                     .ty = ty.toIntern(),
                     .storage = .{ .elems = result_data },
-                } })).toValue(),
+                } }))),
             };
         }
         return shlWithOverflowScalar(lhs, rhs, ty, allocator, mod);
 @@ -2981,10 +2988,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try shlSatScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return shlSatScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -3031,10 +3038,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try shlTruncScalar(lhs_elem, rhs_elem, scalar_ty, arena, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return shlTruncScalar(lhs, rhs, ty, arena, mod);
     }
 @@ -3061,10 +3068,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try shrScalar(lhs_elem, rhs_elem, scalar_ty, allocator, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return shrScalar(lhs, rhs, ty, allocator, mod);
     }
 @@ -3113,10 +3120,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try floatNegScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatNegScalar(val, float_type, mod);
     }
 @@ -3135,10 +3142,10 @@ pub const Value = struct {
             128 => .{ .f128 = -val.toFloat(f128, mod) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatAdd(
 @@ -3156,10 +3163,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatAddScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatAddScalar(lhs, rhs, float_type, mod);
     }
 @@ -3179,10 +3186,10 @@ pub const Value = struct {
             128 => .{ .f128 = lhs.toFloat(f128, mod) + rhs.toFloat(f128, mod) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatSub(
 @@ -3200,10 +3207,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatSubScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatSubScalar(lhs, rhs, float_type, mod);
     }
 @@ -3223,10 +3230,10 @@ pub const Value = struct {
             128 => .{ .f128 = lhs.toFloat(f128, mod) - rhs.toFloat(f128, mod) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatDiv(
 @@ -3244,10 +3251,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatDivScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatDivScalar(lhs, rhs, float_type, mod);
     }
 @@ -3267,10 +3274,10 @@ pub const Value = struct {
             128 => .{ .f128 = lhs.toFloat(f128, mod) / rhs.toFloat(f128, mod) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatDivFloor(
 @@ -3288,10 +3295,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatDivFloorScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatDivFloorScalar(lhs, rhs, float_type, mod);
     }
 @@ -3311,10 +3318,10 @@ pub const Value = struct {
             128 => .{ .f128 = @divFloor(lhs.toFloat(f128, mod), rhs.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatDivTrunc(
 @@ -3332,10 +3339,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatDivTruncScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatDivTruncScalar(lhs, rhs, float_type, mod);
     }
 @@ -3355,10 +3362,10 @@ pub const Value = struct {
             128 => .{ .f128 = @divTrunc(lhs.toFloat(f128, mod), rhs.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn floatMul(
 @@ -3376,10 +3383,10 @@ pub const Value = struct {
                 const rhs_elem = try rhs.elemValue(mod, i);
                 scalar.* = try (try floatMulScalar(lhs_elem, rhs_elem, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floatMulScalar(lhs, rhs, float_type, mod);
     }
 @@ -3399,10 +3406,10 @@ pub const Value = struct {
             128 => .{ .f128 = lhs.toFloat(f128, mod) * rhs.toFloat(f128, mod) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn sqrt(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3413,10 +3420,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try sqrtScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return sqrtScalar(val, float_type, mod);
     }
 @@ -3431,10 +3438,10 @@ pub const Value = struct {
             128 => .{ .f128 = @sqrt(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn sin(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3445,10 +3452,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try sinScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return sinScalar(val, float_type, mod);
     }
 @@ -3463,10 +3470,10 @@ pub const Value = struct {
             128 => .{ .f128 = @sin(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn cos(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3477,10 +3484,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try cosScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return cosScalar(val, float_type, mod);
     }
 @@ -3495,10 +3502,10 @@ pub const Value = struct {
             128 => .{ .f128 = @cos(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn tan(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3509,10 +3516,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try tanScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return tanScalar(val, float_type, mod);
     }
 @@ -3527,10 +3534,10 @@ pub const Value = struct {
             128 => .{ .f128 = @tan(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn exp(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3541,10 +3548,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try expScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return expScalar(val, float_type, mod);
     }
 @@ -3559,10 +3566,10 @@ pub const Value = struct {
             128 => .{ .f128 = @exp(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn exp2(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3573,10 +3580,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try exp2Scalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return exp2Scalar(val, float_type, mod);
     }
 @@ -3591,10 +3598,10 @@ pub const Value = struct {
             128 => .{ .f128 = @exp2(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn log(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3605,10 +3612,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try logScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return logScalar(val, float_type, mod);
     }
 @@ -3623,10 +3630,10 @@ pub const Value = struct {
             128 => .{ .f128 = @log(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn log2(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3637,10 +3644,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try log2Scalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return log2Scalar(val, float_type, mod);
     }
 @@ -3655,10 +3662,10 @@ pub const Value = struct {
             128 => .{ .f128 = @log2(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn log10(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3669,10 +3676,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try log10Scalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return log10Scalar(val, float_type, mod);
     }
 @@ -3687,10 +3694,10 @@ pub const Value = struct {
             128 => .{ .f128 = @log10(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn abs(val: Value, ty: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3701,10 +3708,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try absScalar(elem_val, scalar_ty, mod, arena)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = ty.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return absScalar(val, ty, mod, arena);
     }
 @@ -3735,10 +3742,10 @@ pub const Value = struct {
                     128 => .{ .f128 = @abs(val.toFloat(f128, mod)) },
                     else => unreachable,
                 };
-                return (try mod.intern(.{ .float = .{
+                return Value.fromInterned((try mod.intern(.{ .float = .{
                     .ty = ty.toIntern(),
                     .storage = storage,
-                } })).toValue();
+                } })));
             },
             else => unreachable,
         }
 @@ -3752,10 +3759,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try floorScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return floorScalar(val, float_type, mod);
     }
 @@ -3770,10 +3777,10 @@ pub const Value = struct {
             128 => .{ .f128 = @floor(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn ceil(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3784,10 +3791,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try ceilScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return ceilScalar(val, float_type, mod);
     }
 @@ -3802,10 +3809,10 @@ pub const Value = struct {
             128 => .{ .f128 = @ceil(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn round(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3816,10 +3823,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try roundScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return roundScalar(val, float_type, mod);
     }
 @@ -3834,10 +3841,10 @@ pub const Value = struct {
             128 => .{ .f128 = @round(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn trunc(val: Value, float_type: Type, arena: Allocator, mod: *Module) !Value {
 @@ -3848,10 +3855,10 @@ pub const Value = struct {
                 const elem_val = try val.elemValue(mod, i);
                 scalar.* = try (try truncScalar(elem_val, scalar_ty, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return truncScalar(val, float_type, mod);
     }
 @@ -3866,10 +3873,10 @@ pub const Value = struct {
             128 => .{ .f128 = @trunc(val.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     pub fn mulAdd(
 @@ -3889,10 +3896,10 @@ pub const Value = struct {
                 const addend_elem = try addend.elemValue(mod, i);
                 scalar.* = try (try mulAddScalar(scalar_ty, mulend1_elem, mulend2_elem, addend_elem, mod)).intern(scalar_ty, mod);
             }
-            return (try mod.intern(.{ .aggregate = .{
+            return Value.fromInterned((try mod.intern(.{ .aggregate = .{
                 .ty = float_type.toIntern(),
                 .storage = .{ .elems = result_data },
-            } })).toValue();
+            } })));
         }
         return mulAddScalar(float_type, mulend1, mulend2, addend, mod);
     }
 @@ -3913,10 +3920,10 @@ pub const Value = struct {
             128 => .{ .f128 = @mulAdd(f128, mulend1.toFloat(f128, mod), mulend2.toFloat(f128, mod), addend.toFloat(f128, mod)) },
             else => unreachable,
         };
-        return (try mod.intern(.{ .float = .{
+        return Value.fromInterned((try mod.intern(.{ .float = .{
             .ty = float_type.toIntern(),
             .storage = storage,
-        } })).toValue();
+        } })));
     }
     /// If the value is represented in-memory as a series of bytes that all
 @@ -3958,8 +3965,8 @@ pub const Value = struct {
         const ty = mod.intern_pool.typeOf(val.toIntern());
         if (ty == .comptime_int_type) return null;
         return .{
-            try ty.toType().minInt(mod, ty.toType()),
+            try Type.fromInterned(ty).minInt(mod, Type.fromInterned(ty)),
-            try ty.toType().maxInt(mod, ty.toType()),
+            try Type.fromInterned(ty).maxInt(mod, Type.fromInterned(ty)),
         };
     }

...	@@ -1221,7 +1221,7 @@ pub fn getMainBody(air: Air) []const Air.Inst.Index {	...	@@ -1221,7 +1221,7 @@ pub fn getMainBody(air: Air) []const Air.Inst.Index {
1221		1221
1222	pub fn typeOf(air: const Air, inst: Air.Inst.Ref, ip: const InternPool) Type {	1222	pub fn typeOf(air: const Air, inst: Air.Inst.Ref, ip: const InternPool) Type {
1223	if (refToInterned(inst)) \|ip_index\| {	1223	if (refToInterned(inst)) \|ip_index\| {
1224	return ip.typeOf(ip_index).toType();	1224	return Type.fromInterned(ip.typeOf(ip_index));
1225	} else {	1225	} else {
1226	return air.typeOfIndex(refToIndex(inst).?, ip);	1226	return air.typeOfIndex(refToIndex(inst).?, ip);
1227	}	1227	}
...	@@ -1438,7 +1438,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)	...	@@ -1438,7 +1438,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)
1438		1438
1439	.call, .call_always_tail, .call_never_tail, .call_never_inline => {	1439	.call, .call_always_tail, .call_never_tail, .call_never_inline => {
1440	const callee_ty = air.typeOf(datas[inst].pl_op.operand, ip);	1440	const callee_ty = air.typeOf(datas[inst].pl_op.operand, ip);
1441	return ip.funcTypeReturnType(callee_ty.toIntern()).toType();	1441	return Type.fromInterned(ip.funcTypeReturnType(callee_ty.toIntern()));
1442	},	1442	},
1443		1443
1444	.slice_elem_val, .ptr_elem_val, .array_elem_val => {	1444	.slice_elem_val, .ptr_elem_val, .array_elem_val => {
...	@@ -1456,7 +1456,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)	...	@@ -1456,7 +1456,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)
1456		1456
1457	.reduce, .reduce_optimized => {	1457	.reduce, .reduce_optimized => {
1458	const operand_ty = air.typeOf(datas[inst].reduce.operand, ip);	1458	const operand_ty = air.typeOf(datas[inst].reduce.operand, ip);
1459	return ip.indexToKey(operand_ty.ip_index).vector_type.child.toType();	1459	return Type.fromInterned(ip.indexToKey(operand_ty.ip_index).vector_type.child);
1460	},	1460	},
1461		1461
1462	.mul_add => return air.typeOf(datas[inst].pl_op.operand, ip),	1462	.mul_add => return air.typeOf(datas[inst].pl_op.operand, ip),
...	@@ -1467,7 +1467,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)	...	@@ -1467,7 +1467,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)
1467		1467
1468	.@"try" => {	1468	.@"try" => {
1469	const err_union_ty = air.typeOf(datas[inst].pl_op.operand, ip);	1469	const err_union_ty = air.typeOf(datas[inst].pl_op.operand, ip);
1470	return ip.indexToKey(err_union_ty.ip_index).error_union_type.payload_type.toType();	1470	return Type.fromInterned(ip.indexToKey(err_union_ty.ip_index).error_union_type.payload_type);
1471	},	1471	},
1472		1472
1473	.work_item_id,	1473	.work_item_id,
...	@@ -1482,7 +1482,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)	...	@@ -1482,7 +1482,7 @@ pub fn typeOfIndex(air: const Air, inst: Air.Inst.Index, ip: const InternPool)
1482		1482
1483	pub fn getRefType(air: Air, ref: Air.Inst.Ref) Type {	1483	pub fn getRefType(air: Air, ref: Air.Inst.Ref) Type {
1484	_ = air; // TODO: remove this parameter	1484	_ = air; // TODO: remove this parameter
1485	return refToInterned(ref).?.toType();	1485	return Type.fromInterned(refToInterned(ref).?);
1486	}	1486	}
1487		1487
1488	/// Returns the requested data, as well as the new index which is at the start of the	1488	/// Returns the requested data, as well as the new index which is at the start of the
...	@@ -1561,7 +1561,7 @@ pub fn indexToRef(inst: Inst.Index) Inst.Ref {	...	@@ -1561,7 +1561,7 @@ pub fn indexToRef(inst: Inst.Index) Inst.Ref {
1561	/// Returns `null` if runtime-known.	1561	/// Returns `null` if runtime-known.
1562	pub fn value(air: Air, inst: Inst.Ref, mod: *Module) !?Value {	1562	pub fn value(air: Air, inst: Inst.Ref, mod: *Module) !?Value {
1563	if (refToInterned(inst)) \|ip_index\| {	1563	if (refToInterned(inst)) \|ip_index\| {
1564	return ip_index.toValue();	1564	return Value.fromInterned(ip_index);
1565	}	1565	}
1566	const index = refToIndex(inst).?;	1566	const index = refToIndex(inst).?;
1567	return air.typeOfIndex(index, &mod.intern_pool).onePossibleValue(mod);	1567	return air.typeOfIndex(index, &mod.intern_pool).onePossibleValue(mod);

...	@@ -3044,7 +3044,7 @@ fn airTrunc(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -3044,7 +3044,7 @@ fn airTrunc(self: *Self, inst: Air.Inst.Index) !void {
3044	.storage = .{ .repeated_elem = mask_val.ip_index },	3044	.storage = .{ .repeated_elem = mask_val.ip_index },
3045	} });	3045	} });
3046		3046
3047	const splat_mcv = try self.genTypedValue(.{ .ty = splat_ty, .val = splat_val.toValue() });	3047	const splat_mcv = try self.genTypedValue(.{ .ty = splat_ty, .val = Value.fromInterned(splat_val) });
3048	const splat_addr_mcv: MCValue = switch (splat_mcv) {	3048	const splat_addr_mcv: MCValue = switch (splat_mcv) {
3049	.memory, .indirect, .load_frame => splat_mcv.address(),	3049	.memory, .indirect, .load_frame => splat_mcv.address(),
3050	else => .{ .register = try self.copyToTmpRegister(Type.usize, splat_mcv.address()) },	3050	else => .{ .register = try self.copyToTmpRegister(Type.usize, splat_mcv.address()) },
...	@@ -3196,7 +3196,7 @@ fn activeIntBits(self: *Self, dst_air: Air.Inst.Ref) u16 {	...	@@ -3196,7 +3196,7 @@ fn activeIntBits(self: *Self, dst_air: Air.Inst.Ref) u16 {
3196	}	3196	}
3197	} else if (Air.refToInterned(dst_air)) \|ip_index\| {	3197	} else if (Air.refToInterned(dst_air)) \|ip_index\| {
3198	var space: Value.BigIntSpace = undefined;	3198	var space: Value.BigIntSpace = undefined;
3199	const src_int = ip_index.toValue().toBigInt(&space, mod);	3199	const src_int = Value.fromInterned(ip_index).toBigInt(&space, mod);
3200	return @as(u16, @intCast(src_int.bitCountTwosComp())) +	3200	return @as(u16, @intCast(src_int.bitCountTwosComp())) +
3201	@intFromBool(src_int.positive and dst_info.signedness == .signed);	3201	@intFromBool(src_int.positive and dst_info.signedness == .signed);
3202	}	3202	}
...	@@ -4429,7 +4429,7 @@ fn airShlShrBinOp(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -4429,7 +4429,7 @@ fn airShlShrBinOp(self: *Self, inst: Air.Inst.Index) !void {
4429	self.register_manager.unlockReg(lock);	4429	self.register_manager.unlockReg(lock);
4430		4430
4431	const shift_imm =	4431	const shift_imm =
4432	Immediate.u(@intCast(rhs_elem.toValue().toUnsignedInt(mod)));	4432	Immediate.u(@intCast(Value.fromInterned(rhs_elem).toUnsignedInt(mod)));
4433	if (self.hasFeature(.avx)) try self.asmRegisterRegisterImmediate(	4433	if (self.hasFeature(.avx)) try self.asmRegisterRegisterImmediate(
4434	mir_tag,	4434	mir_tag,
4435	registerAlias(dst_reg, abi_size),	4435	registerAlias(dst_reg, abi_size),
...	@@ -4477,14 +4477,14 @@ fn airShlShrBinOp(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -4477,14 +4477,14 @@ fn airShlShrBinOp(self: *Self, inst: Air.Inst.Index) !void {
4477	const mask_ty = try mod.vectorType(.{ .len = 16, .child = .u8_type });	4477	const mask_ty = try mod.vectorType(.{ .len = 16, .child = .u8_type });
4478	const mask_mcv = try self.genTypedValue(.{	4478	const mask_mcv = try self.genTypedValue(.{
4479	.ty = mask_ty,	4479	.ty = mask_ty,
4480	.val = (try mod.intern(.{ .aggregate = .{	4480	.val = Value.fromInterned((try mod.intern(.{ .aggregate = .{
4481	.ty = mask_ty.toIntern(),	4481	.ty = mask_ty.toIntern(),
4482	.storage = .{ .elems = &([1]InternPool.Index{	4482	.storage = .{ .elems = &([1]InternPool.Index{
4483	(try rhs_ty.childType(mod).maxIntScalar(mod, Type.u8)).toIntern(),	4483	(try rhs_ty.childType(mod).maxIntScalar(mod, Type.u8)).toIntern(),
4484	} ++ [1]InternPool.Index{	4484	} ++ [1]InternPool.Index{
4485	(try mod.intValue(Type.u8, 0)).toIntern(),	4485	(try mod.intValue(Type.u8, 0)).toIntern(),
4486	} ** 15) },	4486	} ** 15) },
4487	} })).toValue(),	4487	} }))),
4488	});	4488	});
4489	const mask_addr_reg =	4489	const mask_addr_reg =
4490	try self.copyToTmpRegister(Type.usize, mask_mcv.address());	4490	try self.copyToTmpRegister(Type.usize, mask_mcv.address());
...	@@ -6714,7 +6714,7 @@ fn packedLoad(self: *Self, dst_mcv: MCValue, ptr_ty: Type, ptr_mcv: MCValue) Inn	...	@@ -6714,7 +6714,7 @@ fn packedLoad(self: *Self, dst_mcv: MCValue, ptr_ty: Type, ptr_mcv: MCValue) Inn
6714	const mod = self.bin_file.options.module.?;	6714	const mod = self.bin_file.options.module.?;
6715	const ptr_info = ptr_ty.ptrInfo(mod);	6715	const ptr_info = ptr_ty.ptrInfo(mod);
6716		6716
6717	const val_ty = ptr_info.child.toType();	6717	const val_ty = Type.fromInterned(ptr_info.child);
6718	if (!val_ty.hasRuntimeBitsIgnoreComptime(mod)) return;	6718	if (!val_ty.hasRuntimeBitsIgnoreComptime(mod)) return;
6719	const val_abi_size: u32 = @intCast(val_ty.abiSize(mod));	6719	const val_abi_size: u32 = @intCast(val_ty.abiSize(mod));
6720		6720
...	@@ -10759,7 +10759,7 @@ fn genCall(self: *Self, info: union(enum) {	...	@@ -10759,7 +10759,7 @@ fn genCall(self: *Self, info: union(enum) {
10759	switch (call_info.return_value.long) {	10759	switch (call_info.return_value.long) {
10760	.none, .unreach => {},	10760	.none, .unreach => {},
10761	.indirect => \|reg_off\| {	10761	.indirect => \|reg_off\| {
10762	const ret_ty = fn_info.return_type.toType();	10762	const ret_ty = Type.fromInterned(fn_info.return_type);
10763	const frame_index = try self.allocFrameIndex(FrameAlloc.initSpill(ret_ty, mod));	10763	const frame_index = try self.allocFrameIndex(FrameAlloc.initSpill(ret_ty, mod));
10764	try self.genSetReg(reg_off.reg, Type.usize, .{	10764	try self.genSetReg(reg_off.reg, Type.usize, .{
10765	.lea_frame = .{ .index = frame_index, .off = -reg_off.off },	10765	.lea_frame = .{ .index = frame_index, .off = -reg_off.off },
...	@@ -15343,7 +15343,7 @@ fn airUnionInit(self: *Self, inst: Air.Inst.Index) !void {	...	@@ -15343,7 +15343,7 @@ fn airUnionInit(self: *Self, inst: Air.Inst.Index) !void {
15343		15343
15344	const union_obj = mod.typeToUnion(union_ty).?;	15344	const union_obj = mod.typeToUnion(union_ty).?;
15345	const field_name = union_obj.field_names.get(ip)[extra.field_index];	15345	const field_name = union_obj.field_names.get(ip)[extra.field_index];
15346	const tag_ty = union_obj.enum_tag_ty.toType();	15346	const tag_ty = Type.fromInterned(union_obj.enum_tag_ty);
15347	const field_index = tag_ty.enumFieldIndex(field_name, mod).?;	15347	const field_index = tag_ty.enumFieldIndex(field_name, mod).?;
15348	const tag_val = try mod.enumValueFieldIndex(tag_ty, field_index);	15348	const tag_val = try mod.enumValueFieldIndex(tag_ty, field_index);
15349	const tag_int_val = try tag_val.intFromEnum(tag_ty, mod);	15349	const tag_int_val = try tag_val.intFromEnum(tag_ty, mod);
...	@@ -15812,7 +15812,7 @@ fn resolveInst(self: *Self, ref: Air.Inst.Ref) InnerError!MCValue {	...	@@ -15812,7 +15812,7 @@ fn resolveInst(self: *Self, ref: Air.Inst.Ref) InnerError!MCValue {
15812	const ip_index = Air.refToInterned(ref).?;	15812	const ip_index = Air.refToInterned(ref).?;
15813	const gop = try self.const_tracking.getOrPut(self.gpa, ip_index);	15813	const gop = try self.const_tracking.getOrPut(self.gpa, ip_index);
15814	if (!gop.found_existing) gop.value_ptr.* = InstTracking.init(init: {	15814	if (!gop.found_existing) gop.value_ptr.* = InstTracking.init(init: {
15815	const const_mcv = try self.genTypedValue(.{ .ty = ty, .val = ip_index.toValue() });	15815	const const_mcv = try self.genTypedValue(.{ .ty = ty, .val = Value.fromInterned(ip_index) });
15816	switch (const_mcv) {	15816	switch (const_mcv) {
15817	.lea_tlv => \|tlv_sym\| if (self.bin_file.cast(link.File.Elf)) \|_\| {	15817	.lea_tlv => \|tlv_sym\| if (self.bin_file.cast(link.File.Elf)) \|_\| {
15818	if (self.bin_file.options.pic) {	15818	if (self.bin_file.options.pic) {
...	@@ -15921,7 +15921,7 @@ fn resolveCallingConventionValues(	...	@@ -15921,7 +15921,7 @@ fn resolveCallingConventionValues(
15921	defer self.gpa.free(param_types);	15921	defer self.gpa.free(param_types);
15922		15922
15923	for (param_types[0..fn_info.param_types.len], fn_info.param_types.get(ip)) \|*dest, src\| {	15923	for (param_types[0..fn_info.param_types.len], fn_info.param_types.get(ip)) \|*dest, src\| {
15924	dest.* = src.toType();	15924	dest.* = Type.fromInterned(src);
15925	}	15925	}
15926	for (param_types[fn_info.param_types.len..], var_args) \|*param_ty, arg_ty\|	15926	for (param_types[fn_info.param_types.len..], var_args) \|*param_ty, arg_ty\|
15927	param_ty.* = self.promoteVarArg(arg_ty);	15927	param_ty.* = self.promoteVarArg(arg_ty);
...	@@ -15937,7 +15937,7 @@ fn resolveCallingConventionValues(	...	@@ -15937,7 +15937,7 @@ fn resolveCallingConventionValues(
15937	};	15937	};
15938	errdefer self.gpa.free(result.args);	15938	errdefer self.gpa.free(result.args);
15939		15939
15940	const ret_ty = fn_info.return_type.toType();	15940	const ret_ty = Type.fromInterned(fn_info.return_type);
15941		15941
15942	const resolved_cc = abi.resolveCallingConvention(cc, self.target.*);	15942	const resolved_cc = abi.resolveCallingConvention(cc, self.target.*);
15943	switch (cc) {	15943	switch (cc) {

...	@@ -224,7 +224,7 @@ pub fn classifySystemV(ty: Type, mod: *Module, ctx: Context) [8]Class {	...	@@ -224,7 +224,7 @@ pub fn classifySystemV(ty: Type, mod: *Module, ctx: Context) [8]Class {
224	var result_i: usize = 0; // out of 8	224	var result_i: usize = 0; // out of 8
225	var byte_i: usize = 0; // out of 8	225	var byte_i: usize = 0; // out of 8
226	for (struct_type.field_types.get(ip), 0..) \|field_ty_ip, i\| {	226	for (struct_type.field_types.get(ip), 0..) \|field_ty_ip, i\| {
227	const field_ty = field_ty_ip.toType();	227	const field_ty = Type.fromInterned(field_ty_ip);
228	const field_align = struct_type.fieldAlign(ip, i);	228	const field_align = struct_type.fieldAlign(ip, i);
229	if (field_align != .none and field_align.compare(.lt, field_ty.abiAlignment(mod)))	229	if (field_align != .none and field_align.compare(.lt, field_ty.abiAlignment(mod)))
230	return memory_class;	230	return memory_class;
...	@@ -342,12 +342,12 @@ pub fn classifySystemV(ty: Type, mod: *Module, ctx: Context) [8]Class {	...	@@ -342,12 +342,12 @@ pub fn classifySystemV(ty: Type, mod: *Module, ctx: Context) [8]Class {
342	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {	342	for (union_obj.field_types.get(ip), 0..) \|field_ty, field_index\| {
343	const field_align = union_obj.fieldAlign(ip, @intCast(field_index));	343	const field_align = union_obj.fieldAlign(ip, @intCast(field_index));
344	if (field_align != .none and	344	if (field_align != .none and
345	field_align.compare(.lt, field_ty.toType().abiAlignment(mod)))	345	field_align.compare(.lt, Type.fromInterned(field_ty).abiAlignment(mod)))
346	{	346	{
347	return memory_class;	347	return memory_class;
348	}	348	}
349	// Combine this field with the previous one.	349	// Combine this field with the previous one.
350	const field_class = classifySystemV(field_ty.toType(), mod, .field);	350	const field_class = classifySystemV(Type.fromInterned(field_ty), mod, .field);
351	for (&result, 0..) \|*result_item, i\| {	351	for (&result, 0..) \|*result_item, i\| {
352	const field_item = field_class[i];	352	const field_item = field_class[i];
353	// "If both classes are equal, this is the resulting class."	353	// "If both classes are equal, this is the resulting class."

...	@@ -1189,7 +1189,7 @@ pub fn updateDecl(	...	@@ -1189,7 +1189,7 @@ pub fn updateDecl(
1189	var code_buffer = std.ArrayList(u8).init(self.base.allocator);	1189	var code_buffer = std.ArrayList(u8).init(self.base.allocator);
1190	defer code_buffer.deinit();	1190	defer code_buffer.deinit();
1191		1191
1192	const decl_val = if (decl.val.getVariable(mod)) \|variable\| variable.init.toValue() else decl.val;	1192	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
1193	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{	1193	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
1194	.ty = decl.ty,	1194	.ty = decl.ty,
1195	.val = decl_val,	1195	.val = decl_val,
...	@@ -1794,7 +1794,7 @@ pub fn lowerAnonDecl(	...	@@ -1794,7 +1794,7 @@ pub fn lowerAnonDecl(
1794	) !codegen.Result {	1794	) !codegen.Result {
1795	const gpa = self.base.allocator;	1795	const gpa = self.base.allocator;
1796	const mod = self.base.options.module.?;	1796	const mod = self.base.options.module.?;
1797	const ty = mod.intern_pool.typeOf(decl_val).toType();	1797	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
1798	const decl_alignment = switch (explicit_alignment) {	1798	const decl_alignment = switch (explicit_alignment) {
1799	.none => ty.abiAlignment(mod),	1799	.none => ty.abiAlignment(mod),
1800	else => explicit_alignment,	1800	else => explicit_alignment,
...	@@ -1805,7 +1805,7 @@ pub fn lowerAnonDecl(	...	@@ -1805,7 +1805,7 @@ pub fn lowerAnonDecl(
1805	return .ok;	1805	return .ok;
1806	}	1806	}
1807		1807
1808	const val = decl_val.toValue();	1808	const val = Value.fromInterned(decl_val);
1809	const tv = TypedValue{ .ty = ty, .val = val };	1809	const tv = TypedValue{ .ty = ty, .val = val };
1810	var name_buf: [32]u8 = undefined;	1810	var name_buf: [32]u8 = undefined;
1811	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{	1811	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{
...	@@ -2669,6 +2669,7 @@ const Relocation = @import("Coff/Relocation.zig");	...	@@ -2669,6 +2669,7 @@ const Relocation = @import("Coff/Relocation.zig");
2669	const TableSection = @import("table_section.zig").TableSection;	2669	const TableSection = @import("table_section.zig").TableSection;
2670	const StringTable = @import("StringTable.zig");	2670	const StringTable = @import("StringTable.zig");
2671	const Type = @import("../type.zig").Type;	2671	const Type = @import("../type.zig").Type;
		2672	const Value = @import("../value.zig").Value;
2672	const TypedValue = @import("../TypedValue.zig");	2673	const TypedValue = @import("../TypedValue.zig");
2673		2674
2674	pub const base_tag: link.File.Tag = .coff;	2675	pub const base_tag: link.File.Tag = .coff;

...	@@ -305,7 +305,7 @@ pub const DeclState = struct {	...	@@ -305,7 +305,7 @@ pub const DeclState = struct {
305	// DW.AT.type, DW.FORM.ref4	305	// DW.AT.type, DW.FORM.ref4
306	const index = dbg_info_buffer.items.len;	306	const index = dbg_info_buffer.items.len;
307	try dbg_info_buffer.resize(index + 4);	307	try dbg_info_buffer.resize(index + 4);
308	try self.addTypeRelocGlobal(atom_index, field_ty.toType(), @intCast(index));	308	try self.addTypeRelocGlobal(atom_index, Type.fromInterned(field_ty), @intCast(index));
309	// DW.AT.data_member_location, DW.FORM.udata	309	// DW.AT.data_member_location, DW.FORM.udata
310	const field_off = ty.structFieldOffset(field_index, mod);	310	const field_off = ty.structFieldOffset(field_index, mod);
311	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);	311	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);
...	@@ -323,7 +323,7 @@ pub const DeclState = struct {	...	@@ -323,7 +323,7 @@ pub const DeclState = struct {
323		323
324	if (struct_type.isTuple(ip)) {	324	if (struct_type.isTuple(ip)) {
325	for (struct_type.field_types.get(ip), struct_type.offsets.get(ip), 0..) \|field_ty, field_off, field_index\| {	325	for (struct_type.field_types.get(ip), struct_type.offsets.get(ip), 0..) \|field_ty, field_off, field_index\| {
326	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	326	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
327	// DW.AT.member	327	// DW.AT.member
328	try dbg_info_buffer.append(@intFromEnum(AbbrevKind.struct_member));	328	try dbg_info_buffer.append(@intFromEnum(AbbrevKind.struct_member));
329	// DW.AT.name, DW.FORM.string	329	// DW.AT.name, DW.FORM.string
...	@@ -331,7 +331,7 @@ pub const DeclState = struct {	...	@@ -331,7 +331,7 @@ pub const DeclState = struct {
331	// DW.AT.type, DW.FORM.ref4	331	// DW.AT.type, DW.FORM.ref4
332	const index = dbg_info_buffer.items.len;	332	const index = dbg_info_buffer.items.len;
333	try dbg_info_buffer.resize(index + 4);	333	try dbg_info_buffer.resize(index + 4);
334	try self.addTypeRelocGlobal(atom_index, field_ty.toType(), @intCast(index));	334	try self.addTypeRelocGlobal(atom_index, Type.fromInterned(field_ty), @intCast(index));
335	// DW.AT.data_member_location, DW.FORM.udata	335	// DW.AT.data_member_location, DW.FORM.udata
336	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);	336	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);
337	}	337	}
...	@@ -341,7 +341,7 @@ pub const DeclState = struct {	...	@@ -341,7 +341,7 @@ pub const DeclState = struct {
341	struct_type.field_types.get(ip),	341	struct_type.field_types.get(ip),
342	struct_type.offsets.get(ip),	342	struct_type.offsets.get(ip),
343	) \|field_name_ip, field_ty, field_off\| {	343	) \|field_name_ip, field_ty, field_off\| {
344	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	344	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
345	const field_name = ip.stringToSlice(field_name_ip);	345	const field_name = ip.stringToSlice(field_name_ip);
346	// DW.AT.member	346	// DW.AT.member
347	try dbg_info_buffer.ensureUnusedCapacity(field_name.len + 2);	347	try dbg_info_buffer.ensureUnusedCapacity(field_name.len + 2);
...	@@ -352,7 +352,7 @@ pub const DeclState = struct {	...	@@ -352,7 +352,7 @@ pub const DeclState = struct {
352	// DW.AT.type, DW.FORM.ref4	352	// DW.AT.type, DW.FORM.ref4
353	const index = dbg_info_buffer.items.len;	353	const index = dbg_info_buffer.items.len;
354	try dbg_info_buffer.resize(index + 4);	354	try dbg_info_buffer.resize(index + 4);
355	try self.addTypeRelocGlobal(atom_index, field_ty.toType(), @intCast(index));	355	try self.addTypeRelocGlobal(atom_index, Type.fromInterned(field_ty), @intCast(index));
356	// DW.AT.data_member_location, DW.FORM.udata	356	// DW.AT.data_member_location, DW.FORM.udata
357	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);	357	try leb128.writeULEB128(dbg_info_buffer.writer(), field_off);
358	}	358	}
...	@@ -389,7 +389,7 @@ pub const DeclState = struct {	...	@@ -389,7 +389,7 @@ pub const DeclState = struct {
389	const value = enum_type.values.get(ip)[field_i];	389	const value = enum_type.values.get(ip)[field_i];
390	// TODO do not assume a 64bit enum value - could be bigger.	390	// TODO do not assume a 64bit enum value - could be bigger.
391	// See https://github.com/ziglang/zig/issues/645	391	// See https://github.com/ziglang/zig/issues/645
392	const field_int_val = try value.toValue().intFromEnum(ty, mod);	392	const field_int_val = try Value.fromInterned(value).intFromEnum(ty, mod);
393	break :value @bitCast(field_int_val.toSignedInt(mod));	393	break :value @bitCast(field_int_val.toSignedInt(mod));
394	};	394	};
395	mem.writeInt(u64, dbg_info_buffer.addManyAsArrayAssumeCapacity(8), value, target_endian);	395	mem.writeInt(u64, dbg_info_buffer.addManyAsArrayAssumeCapacity(8), value, target_endian);
...	@@ -443,7 +443,7 @@ pub const DeclState = struct {	...	@@ -443,7 +443,7 @@ pub const DeclState = struct {
443	}	443	}
444		444
445	for (union_obj.field_types.get(ip), union_obj.field_names.get(ip)) \|field_ty, field_name\| {	445	for (union_obj.field_types.get(ip), union_obj.field_names.get(ip)) \|field_ty, field_name\| {
446	if (!field_ty.toType().hasRuntimeBits(mod)) continue;	446	if (!Type.fromInterned(field_ty).hasRuntimeBits(mod)) continue;
447	// DW.AT.member	447	// DW.AT.member
448	try dbg_info_buffer.append(@intFromEnum(AbbrevKind.struct_member));	448	try dbg_info_buffer.append(@intFromEnum(AbbrevKind.struct_member));
449	// DW.AT.name, DW.FORM.string	449	// DW.AT.name, DW.FORM.string
...	@@ -452,7 +452,7 @@ pub const DeclState = struct {	...	@@ -452,7 +452,7 @@ pub const DeclState = struct {
452	// DW.AT.type, DW.FORM.ref4	452	// DW.AT.type, DW.FORM.ref4
453	const index = dbg_info_buffer.items.len;	453	const index = dbg_info_buffer.items.len;
454	try dbg_info_buffer.resize(index + 4);	454	try dbg_info_buffer.resize(index + 4);
455	try self.addTypeRelocGlobal(atom_index, field_ty.toType(), @intCast(index));	455	try self.addTypeRelocGlobal(atom_index, Type.fromInterned(field_ty), @intCast(index));
456	// DW.AT.data_member_location, DW.FORM.udata	456	// DW.AT.data_member_location, DW.FORM.udata
457	try dbg_info_buffer.append(0);	457	try dbg_info_buffer.append(0);
458	}	458	}
...	@@ -469,7 +469,7 @@ pub const DeclState = struct {	...	@@ -469,7 +469,7 @@ pub const DeclState = struct {
469	// DW.AT.type, DW.FORM.ref4	469	// DW.AT.type, DW.FORM.ref4
470	const index = dbg_info_buffer.items.len;	470	const index = dbg_info_buffer.items.len;
471	try dbg_info_buffer.resize(index + 4);	471	try dbg_info_buffer.resize(index + 4);
472	try self.addTypeRelocGlobal(atom_index, union_obj.enum_tag_ty.toType(), @intCast(index));	472	try self.addTypeRelocGlobal(atom_index, Type.fromInterned(union_obj.enum_tag_ty), @intCast(index));
473	// DW.AT.data_member_location, DW.FORM.udata	473	// DW.AT.data_member_location, DW.FORM.udata
474	try leb128.writeULEB128(dbg_info_buffer.writer(), tag_offset);	474	try leb128.writeULEB128(dbg_info_buffer.writer(), tag_offset);
475		475

...	@@ -660,7 +660,7 @@ pub fn lowerAnonDecl(	...	@@ -660,7 +660,7 @@ pub fn lowerAnonDecl(
660	) !codegen.Result {	660	) !codegen.Result {
661	const gpa = elf_file.base.allocator;	661	const gpa = elf_file.base.allocator;
662	const mod = elf_file.base.options.module.?;	662	const mod = elf_file.base.options.module.?;
663	const ty = mod.intern_pool.typeOf(decl_val).toType();	663	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
664	const decl_alignment = switch (explicit_alignment) {	664	const decl_alignment = switch (explicit_alignment) {
665	.none => ty.abiAlignment(mod),	665	.none => ty.abiAlignment(mod),
666	else => explicit_alignment,	666	else => explicit_alignment,
...	@@ -671,7 +671,7 @@ pub fn lowerAnonDecl(	...	@@ -671,7 +671,7 @@ pub fn lowerAnonDecl(
671	return .ok;	671	return .ok;
672	}	672	}
673		673
674	const val = decl_val.toValue();	674	const val = Value.fromInterned(decl_val);
675	const tv = TypedValue{ .ty = ty, .val = val };	675	const tv = TypedValue{ .ty = ty, .val = val };
676	var name_buf: [32]u8 = undefined;	676	var name_buf: [32]u8 = undefined;
677	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{	677	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{
...	@@ -835,7 +835,7 @@ fn getDeclShdrIndex(	...	@@ -835,7 +835,7 @@ fn getDeclShdrIndex(
835	});	835	});
836	}	836	}
837	if (variable.is_const) break :blk elf_file.zig_data_rel_ro_section_index.?;	837	if (variable.is_const) break :blk elf_file.zig_data_rel_ro_section_index.?;
838	if (variable.init.toValue().isUndefDeep(mod)) {	838	if (Value.fromInterned(variable.init).isUndefDeep(mod)) {
839	const mode = elf_file.base.options.optimize_mode;	839	const mode = elf_file.base.options.optimize_mode;
840	if (mode == .Debug or mode == .ReleaseSafe) break :blk elf_file.zig_data_section_index.?;	840	if (mode == .Debug or mode == .ReleaseSafe) break :blk elf_file.zig_data_section_index.?;
841	break :blk elf_file.zig_bss_section_index.?;	841	break :blk elf_file.zig_bss_section_index.?;
...	@@ -1114,7 +1114,7 @@ pub fn updateDecl(	...	@@ -1114,7 +1114,7 @@ pub fn updateDecl(
1114	defer if (decl_state) \|*ds\| ds.deinit();	1114	defer if (decl_state) \|*ds\| ds.deinit();
1115		1115
1116	// TODO implement .debug_info for global variables	1116	// TODO implement .debug_info for global variables
1117	const decl_val = if (decl.val.getVariable(mod)) \|variable\| variable.init.toValue() else decl.val;	1117	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
1118	const res = if (decl_state) \|*ds\|	1118	const res = if (decl_state) \|*ds\|
1119	try codegen.generateSymbol(&elf_file.base, decl.srcLoc(mod), .{	1119	try codegen.generateSymbol(&elf_file.base, decl.srcLoc(mod), .{
1120	.ty = decl.ty,	1120	.ty = decl.ty,
...	@@ -1613,5 +1613,7 @@ const Module = @import("../../Module.zig");	...	@@ -1613,5 +1613,7 @@ const Module = @import("../../Module.zig");
1613	const Object = @import("Object.zig");	1613	const Object = @import("Object.zig");
1614	const Symbol = @import("Symbol.zig");	1614	const Symbol = @import("Symbol.zig");
1615	const StringTable = @import("../StringTable.zig");	1615	const StringTable = @import("../StringTable.zig");
		1616	const Type = @import("../../type.zig").Type;
		1617	const Value = @import("../../value.zig").Value;
1616	const TypedValue = @import("../../TypedValue.zig");	1618	const TypedValue = @import("../../TypedValue.zig");
1617	const ZigObject = @This();	1619	const ZigObject = @This();

...	@@ -2400,7 +2400,7 @@ pub fn updateDecl(self: MachO, mod: Module, decl_index: Module.Decl.Index) !vo	...	@@ -2400,7 +2400,7 @@ pub fn updateDecl(self: MachO, mod: Module, decl_index: Module.Decl.Index) !vo
2400	null;	2400	null;
2401	defer if (decl_state) \|*ds\| ds.deinit();	2401	defer if (decl_state) \|*ds\| ds.deinit();
2402		2402
2403	const decl_val = if (decl.val.getVariable(mod)) \|variable\| variable.init.toValue() else decl.val;	2403	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
2404	const res = if (decl_state) \|*ds\|	2404	const res = if (decl_state) \|*ds\|
2405	try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{	2405	try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
2406	.ty = decl.ty,	2406	.ty = decl.ty,
...	@@ -2569,7 +2569,7 @@ fn updateThreadlocalVariable(self: MachO, module: Module, decl_index: Module.D	...	@@ -2569,7 +2569,7 @@ fn updateThreadlocalVariable(self: MachO, module: Module, decl_index: Module.D
2569		2569
2570	const decl = module.declPtr(decl_index);	2570	const decl = module.declPtr(decl_index);
2571	const decl_metadata = self.decls.get(decl_index).?;	2571	const decl_metadata = self.decls.get(decl_index).?;
2572	const decl_val = decl.val.getVariable(mod).?.init.toValue();	2572	const decl_val = Value.fromInterned(decl.val.getVariable(mod).?.init);
2573	const res = if (decl_state) \|*ds\|	2573	const res = if (decl_state) \|*ds\|
2574	try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{	2574	try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
2575	.ty = decl.ty,	2575	.ty = decl.ty,
...	@@ -2995,7 +2995,7 @@ pub fn lowerAnonDecl(	...	@@ -2995,7 +2995,7 @@ pub fn lowerAnonDecl(
2995	) !codegen.Result {	2995	) !codegen.Result {
2996	const gpa = self.base.allocator;	2996	const gpa = self.base.allocator;
2997	const mod = self.base.options.module.?;	2997	const mod = self.base.options.module.?;
2998	const ty = mod.intern_pool.typeOf(decl_val).toType();	2998	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
2999	const decl_alignment = switch (explicit_alignment) {	2999	const decl_alignment = switch (explicit_alignment) {
3000	.none => ty.abiAlignment(mod),	3000	.none => ty.abiAlignment(mod),
3001	else => explicit_alignment,	3001	else => explicit_alignment,
...	@@ -3006,7 +3006,7 @@ pub fn lowerAnonDecl(	...	@@ -3006,7 +3006,7 @@ pub fn lowerAnonDecl(
3006	return .ok;	3006	return .ok;
3007	}	3007	}
3008		3008
3009	const val = decl_val.toValue();	3009	const val = Value.fromInterned(decl_val);
3010	const tv = TypedValue{ .ty = ty, .val = val };	3010	const tv = TypedValue{ .ty = ty, .val = val };
3011	var name_buf: [32]u8 = undefined;	3011	var name_buf: [32]u8 = undefined;
3012	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{	3012	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{

...	@@ -13,6 +13,8 @@ const File = link.File;	...	@@ -13,6 +13,8 @@ const File = link.File;
13	const build_options = @import("build_options");	13	const build_options = @import("build_options");
14	const Air = @import("../Air.zig");	14	const Air = @import("../Air.zig");
15	const Liveness = @import("../Liveness.zig");	15	const Liveness = @import("../Liveness.zig");
		16	const Type = @import("../type.zig").Type;
		17	const Value = @import("../value.zig").Value;
16	const TypedValue = @import("../TypedValue.zig");	18	const TypedValue = @import("../TypedValue.zig");
17		19
18	const std = @import("std");	20	const std = @import("std");
...	@@ -517,7 +519,7 @@ pub fn updateDecl(self: Plan9, mod: Module, decl_index: Module.Decl.Index) !vo	...	@@ -517,7 +519,7 @@ pub fn updateDecl(self: Plan9, mod: Module, decl_index: Module.Decl.Index) !vo
517		519
518	var code_buffer = std.ArrayList(u8).init(self.base.allocator);	520	var code_buffer = std.ArrayList(u8).init(self.base.allocator);
519	defer code_buffer.deinit();	521	defer code_buffer.deinit();
520	const decl_val = if (decl.val.getVariable(mod)) \|variable\| variable.init.toValue() else decl.val;	522	const decl_val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
521	// TODO we need the symbol index for symbol in the table of locals for the containing atom	523	// TODO we need the symbol index for symbol in the table of locals for the containing atom
522	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{	524	const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{
523	.ty = decl.ty,	525	.ty = decl.ty,
...	@@ -1492,8 +1494,8 @@ pub fn lowerAnonDecl(self: *Plan9, decl_val: InternPool.Index, src_loc: Module.S	...	@@ -1492,8 +1494,8 @@ pub fn lowerAnonDecl(self: *Plan9, decl_val: InternPool.Index, src_loc: Module.S
1492	const gop = try self.anon_decls.getOrPut(gpa, decl_val);	1494	const gop = try self.anon_decls.getOrPut(gpa, decl_val);
1493	const mod = self.base.options.module.?;	1495	const mod = self.base.options.module.?;
1494	if (!gop.found_existing) {	1496	if (!gop.found_existing) {
1495	const ty = mod.intern_pool.typeOf(decl_val).toType();	1497	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
1496	const val = decl_val.toValue();	1498	const val = Value.fromInterned(decl_val);
1497	const tv = TypedValue{ .ty = ty, .val = val };	1499	const tv = TypedValue{ .ty = ty, .val = val };
1498	const name = try std.fmt.allocPrint(gpa, "__anon_{d}", .{@intFromEnum(decl_val)});	1500	const name = try std.fmt.allocPrint(gpa, "__anon_{d}", .{@intFromEnum(decl_val)});
1499		1501

...	@@ -23,6 +23,7 @@ const build_options = @import("build_options");	...	@@ -23,6 +23,7 @@ const build_options = @import("build_options");
23	const wasi_libc = @import("../wasi_libc.zig");	23	const wasi_libc = @import("../wasi_libc.zig");
24	const Cache = std.Build.Cache;	24	const Cache = std.Build.Cache;
25	const Type = @import("../type.zig").Type;	25	const Type = @import("../type.zig").Type;
		26	const Value = @import("../value.zig").Value;
26	const TypedValue = @import("../TypedValue.zig");	27	const TypedValue = @import("../TypedValue.zig");
27	const LlvmObject = @import("../codegen/llvm.zig").Object;	28	const LlvmObject = @import("../codegen/llvm.zig").Object;
28	const Air = @import("../Air.zig");	29	const Air = @import("../Air.zig");
...	@@ -1452,7 +1453,7 @@ pub fn updateDecl(wasm: Wasm, mod: Module, decl_index: Module.Decl.Index) !voi	...	@@ -1452,7 +1453,7 @@ pub fn updateDecl(wasm: Wasm, mod: Module, decl_index: Module.Decl.Index) !voi
1452	const lib_name = mod.intern_pool.stringToSliceUnwrap(variable.lib_name);	1453	const lib_name = mod.intern_pool.stringToSliceUnwrap(variable.lib_name);
1453	return wasm.addOrUpdateImport(name, atom.sym_index, lib_name, null);	1454	return wasm.addOrUpdateImport(name, atom.sym_index, lib_name, null);
1454	}	1455	}
1455	const val = if (decl.val.getVariable(mod)) \|variable\| variable.init.toValue() else decl.val;	1456	const val = if (decl.val.getVariable(mod)) \|variable\| Value.fromInterned(variable.init) else decl.val;
1456		1457
1457	var code_writer = std.ArrayList(u8).init(wasm.base.allocator);	1458	var code_writer = std.ArrayList(u8).init(wasm.base.allocator);
1458	defer code_writer.deinit();	1459	defer code_writer.deinit();
...	@@ -1719,8 +1720,8 @@ pub fn lowerAnonDecl(	...	@@ -1719,8 +1720,8 @@ pub fn lowerAnonDecl(
1719	const gop = try wasm.anon_decls.getOrPut(wasm.base.allocator, decl_val);	1720	const gop = try wasm.anon_decls.getOrPut(wasm.base.allocator, decl_val);
1720	if (!gop.found_existing) {	1721	if (!gop.found_existing) {
1721	const mod = wasm.base.options.module.?;	1722	const mod = wasm.base.options.module.?;
1722	const ty = mod.intern_pool.typeOf(decl_val).toType();	1723	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
1723	const tv: TypedValue = .{ .ty = ty, .val = decl_val.toValue() };	1724	const tv: TypedValue = .{ .ty = ty, .val = Value.fromInterned(decl_val) };
1724	var name_buf: [32]u8 = undefined;	1725	var name_buf: [32]u8 = undefined;
1725	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{	1726	const name = std.fmt.bufPrint(&name_buf, "__anon_{d}", .{
1726	@intFromEnum(decl_val),	1727	@intFromEnum(decl_val),
...	@@ -1751,7 +1752,7 @@ pub fn getAnonDeclVAddr(wasm: *Wasm, decl_val: InternPool.Index, reloc_info: lin	...	@@ -1751,7 +1752,7 @@ pub fn getAnonDeclVAddr(wasm: *Wasm, decl_val: InternPool.Index, reloc_info: lin
1751	const parent_atom = wasm.getAtomPtr(parent_atom_index);	1752	const parent_atom = wasm.getAtomPtr(parent_atom_index);
1752	const is_wasm32 = wasm.base.options.target.cpu.arch == .wasm32;	1753	const is_wasm32 = wasm.base.options.target.cpu.arch == .wasm32;
1753	const mod = wasm.base.options.module.?;	1754	const mod = wasm.base.options.module.?;
1754	const ty = mod.intern_pool.typeOf(decl_val).toType();	1755	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
1755	if (ty.zigTypeTag(mod) == .Fn) {	1756	if (ty.zigTypeTag(mod) == .Fn) {
1756	assert(reloc_info.addend == 0); // addend not allowed for function relocations	1757	assert(reloc_info.addend == 0); // addend not allowed for function relocations
1757	// We found a function pointer, so add it to our table,	1758	// We found a function pointer, so add it to our table,
...	@@ -3533,7 +3534,7 @@ pub fn flushModule(wasm: Wasm, comp: Compilation, prog_node: *std.Progress.Nod	...	@@ -3533,7 +3534,7 @@ pub fn flushModule(wasm: Wasm, comp: Compilation, prog_node: *std.Progress.Nod
3533	} else if (decl.getOwnedVariable(mod)) \|variable\| {	3534	} else if (decl.getOwnedVariable(mod)) \|variable\| {
3534	if (variable.is_const) {	3535	if (variable.is_const) {
3535	try wasm.parseAtom(atom_index, .{ .data = .read_only });	3536	try wasm.parseAtom(atom_index, .{ .data = .read_only });
3536	} else if (variable.init.toValue().isUndefDeep(mod)) {	3537	} else if (Value.fromInterned(variable.init).isUndefDeep(mod)) {
3537	// for safe build modes, we store the atom in the data segment,	3538	// for safe build modes, we store the atom in the data segment,
3538	// whereas for unsafe build modes we store it in bss.	3539	// whereas for unsafe build modes we store it in bss.
3539	const is_initialized = wasm.base.options.optimize_mode == .Debug or	3540	const is_initialized = wasm.base.options.optimize_mode == .Debug or
...	@@ -3558,7 +3559,7 @@ pub fn flushModule(wasm: Wasm, comp: Compilation, prog_node: *std.Progress.Nod	...	@@ -3558,7 +3559,7 @@ pub fn flushModule(wasm: Wasm, comp: Compilation, prog_node: *std.Progress.Nod
3558	}	3559	}
3559	// parse anonymous declarations	3560	// parse anonymous declarations
3560	for (wasm.anon_decls.keys(), wasm.anon_decls.values()) \|decl_val, atom_index\| {	3561	for (wasm.anon_decls.keys(), wasm.anon_decls.values()) \|decl_val, atom_index\| {
3561	const ty = mod.intern_pool.typeOf(decl_val).toType();	3562	const ty = Type.fromInterned(mod.intern_pool.typeOf(decl_val));
3562	if (ty.zigTypeTag(mod) == .Fn) {	3563	if (ty.zigTypeTag(mod) == .Fn) {
3563	try wasm.parseAtom(atom_index, .function);	3564	try wasm.parseAtom(atom_index, .function);
3564	} else {	3565	} else {

...	@@ -1009,7 +1009,7 @@ fn typeToValtype(ty: Type, mod: *Module) wasm.Valtype {	...	@@ -1009,7 +1009,7 @@ fn typeToValtype(ty: Type, mod: *Module) wasm.Valtype {
1009	},	1009	},
1010	.Struct => {	1010	.Struct => {
1011	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {	1011	if (mod.typeToPackedStruct(ty)) \|packed_struct\| {
1012	return typeToValtype(packed_struct.backingIntType(ip).toType(), mod);	1012	return typeToValtype(Type.fromInterned(packed_struct.backingIntType(ip).*), mod);
1013	} else {	1013	} else {
1014	return wasm.Valtype.i32;	1014	return wasm.Valtype.i32;
1015	}	1015	}
...	@@ -1171,7 +1171,7 @@ fn genFunctype(	...	@@ -1171,7 +1171,7 @@ fn genFunctype(
1171		1171
1172	// param types	1172	// param types
1173	for (params) \|param_type_ip\| {	1173	for (params) \|param_type_ip\| {
1174	const param_type = param_type_ip.toType();	1174	const param_type = Type.fromInterned(param_type_ip);
1175	if (!param_type.hasRuntimeBitsIgnoreComptime(mod)) continue;	1175	if (!param_type.hasRuntimeBitsIgnoreComptime(mod)) continue;
1176		1176
1177	switch (cc) {	1177	switch (cc) {
...	@@ -1240,7 +1240,7 @@ fn genFunc(func: *CodeGen) InnerError!void {	...	@@ -1240,7 +1240,7 @@ fn genFunc(func: *CodeGen) InnerError!void {
1240	const mod = func.bin_file.base.options.module.?;	1240	const mod = func.bin_file.base.options.module.?;
1241	const ip = &mod.intern_pool;	1241	const ip = &mod.intern_pool;
1242	const fn_info = mod.typeToFunc(func.decl.ty).?;	1242	const fn_info = mod.typeToFunc(func.decl.ty).?;
1243	var func_type = try genFunctype(func.gpa, fn_info.cc, fn_info.param_types.get(ip), fn_info.return_type.toType(), mod);	1243	var func_type = try genFunctype(func.gpa, fn_info.cc, fn_info.param_types.get(ip), Type.fromInterned(fn_info.return_type), mod);
1244	defer func_type.deinit(func.gpa);	1244	defer func_type.deinit(func.gpa);
1245	_ = try func.bin_file.storeDeclType(func.decl_index, func_type);	1245	_ = try func.bin_file.storeDeclType(func.decl_index, func_type);
1246		1246
...	@@ -1363,7 +1363,7 @@ fn resolveCallingConventionValues(func: *CodeGen, fn_ty: Type) InnerError!CallWV	...	@@ -1363,7 +1363,7 @@ fn resolveCallingConventionValues(func: *CodeGen, fn_ty: Type) InnerError!CallWV
1363		1363
1364	// Check if we store the result as a pointer to the stack rather than	1364	// Check if we store the result as a pointer to the stack rather than
1365	// by value	1365	// by value
1366	if (firstParamSRet(fn_info.cc, fn_info.return_type.toType(), mod)) {	1366	if (firstParamSRet(fn_info.cc, Type.fromInterned(fn_info.return_type), mod)) {
1367	// the sret arg will be passed as first argument, therefore we	1367	// the sret arg will be passed as first argument, therefore we
1368	// set the `return_value` before allocating locals for regular args.	1368	// set the `return_value` before allocating locals for regular args.
1369	result.return_value = .{ .local = .{ .value = func.local_index, .references = 1 } };	1369	result.return_value = .{ .local = .{ .value = func.local_index, .references = 1 } };
...	@@ -1373,7 +1373,7 @@ fn resolveCallingConventionValues(func: *CodeGen, fn_ty: Type) InnerError!CallWV	...	@@ -1373,7 +1373,7 @@ fn resolveCallingConventionValues(func: *CodeGen, fn_ty: Type) InnerError!CallWV
1373	switch (cc) {	1373	switch (cc) {
1374	.Unspecified => {	1374	.Unspecified => {
1375	for (fn_info.param_types.get(ip)) \|ty\| {	1375	for (fn_info.param_types.get(ip)) \|ty\| {
1376	if (!ty.toType().hasRuntimeBitsIgnoreComptime(mod)) {	1376	if (!Type.fromInterned(ty).hasRuntimeBitsIgnoreComptime(mod)) {
1377	continue;	1377	continue;
1378	}	1378	}
1379		1379

...	@@ -1399,12 +1399,12 @@ pub const Object = struct {	...	@@ -1399,12 +1399,12 @@ pub const Object = struct {
1399	break :param param;	1399	break :param param;
1400	} else .none;	1400	} else .none;
1401		1401
1402	if (ccAbiPromoteInt(fn_info.cc, mod, fn_info.return_type.toType())) \|s\| switch (s) {	1402	if (ccAbiPromoteInt(fn_info.cc, mod, Type.fromInterned(fn_info.return_type))) \|s\| switch (s) {
1403	.signed => try attributes.addRetAttr(.signext, &o.builder),	1403	.signed => try attributes.addRetAttr(.signext, &o.builder),
1404	.unsigned => try attributes.addRetAttr(.zeroext, &o.builder),	1404	.unsigned => try attributes.addRetAttr(.zeroext, &o.builder),
1405	};	1405	};
1406		1406
1407	const err_return_tracing = fn_info.return_type.toType().isError(mod) and	1407	const err_return_tracing = Type.fromInterned(fn_info.return_type).isError(mod) and
1408	mod.comp.bin_file.options.error_return_tracing;	1408	mod.comp.bin_file.options.error_return_tracing;
1409		1409
1410	const err_ret_trace: Builder.Value = if (err_return_tracing) param: {	1410	const err_ret_trace: Builder.Value = if (err_return_tracing) param: {
...	@@ -1430,7 +1430,7 @@ pub const Object = struct {	...	@@ -1430,7 +1430,7 @@ pub const Object = struct {
1430	.byval => {	1430	.byval => {
1431	assert(!it.byval_attr);	1431	assert(!it.byval_attr);
1432	const param_index = it.zig_index - 1;	1432	const param_index = it.zig_index - 1;
1433	const param_ty = fn_info.param_types.get(ip)[param_index].toType();	1433	const param_ty = Type.fromInterned(fn_info.param_types.get(ip)[param_index]);
1434	const param = wip.arg(llvm_arg_i);	1434	const param = wip.arg(llvm_arg_i);
1435		1435
1436	if (isByRef(param_ty, mod)) {	1436	if (isByRef(param_ty, mod)) {
...	@@ -1447,7 +1447,7 @@ pub const Object = struct {	...	@@ -1447,7 +1447,7 @@ pub const Object = struct {
1447	llvm_arg_i += 1;	1447	llvm_arg_i += 1;
1448	},	1448	},
1449	.byref => {	1449	.byref => {
1450	const param_ty = fn_info.param_types.get(ip)[it.zig_index - 1].toType();	1450	const param_ty = Type.fromInterned(fn_info.param_types.get(ip)[it.zig_index - 1]);
1451	const param_llvm_ty = try o.lowerType(param_ty);	1451	const param_llvm_ty = try o.lowerType(param_ty);
1452	const param = wip.arg(llvm_arg_i);	1452	const param = wip.arg(llvm_arg_i);
1453	const alignment = param_ty.abiAlignment(mod).toLlvm();	1453	const alignment = param_ty.abiAlignment(mod).toLlvm();
...	@@ -1462,7 +1462,7 @@ pub const Object = struct {	...	@@ -1462,7 +1462,7 @@ pub const Object = struct {
1462	}	1462	}
1463	},	1463	},
1464	.byref_mut => {	1464	.byref_mut => {
1465	const param_ty = fn_info.param_types.get(ip)[it.zig_index - 1].toType();	1465	const param_ty = Type.fromInterned(fn_info.param_types.get(ip)[it.zig_index - 1]);
1466	const param_llvm_ty = try o.lowerType(param_ty);	1466	const param_llvm_ty = try o.lowerType(param_ty);
1467	const param = wip.arg(llvm_arg_i);	1467	const param = wip.arg(llvm_arg_i);
1468	const alignment = param_ty.abiAlignment(mod).toLlvm();	1468	const alignment = param_ty.abiAlignment(mod).toLlvm();
...	@@ -1478,7 +1478,7 @@ pub const Object = struct {	...	@@ -1478,7 +1478,7 @@ pub const Object = struct {
1478	},	1478	},
1479	.abi_sized_int => {	1479	.abi_sized_int => {