Commit 31aee50c1a96b7e72b42ee885636b27fbcac8eb4 | zig

src/InternPool.zig+38

...	...	@@ -668,6 +668,9 @@ pub const Tag = enum(u8) {
668	668	/// A fully explicitly specified pointer type.
669	669	/// data is payload to Pointer.
670	670	type_pointer,
	671	/// A slice type.
	672	/// data is Index of underlying pointer type.
	673	type_slice,
671	674	/// An optional type.
672	675	/// data is the child type.
673	676	type_optional,
...	...	@@ -984,6 +987,13 @@ pub fn indexToKey(ip: InternPool, index: Index) Key {
984	987	} };
985	988	},
986	989
	990	.type_slice => {
	991	const ptr_ty_index = @intToEnum(Index, data);
	992	var result = indexToKey(ip, ptr_ty_index);
	993	result.ptr_type.size = .Slice;
	994	return result;
	995	},
	996
987	997	.type_optional => .{ .opt_type = @intToEnum(Index, data) },
988	998
989	999	.type_error_union => @panic("TODO"),
...	...	@@ -1041,6 +1051,19 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
1041	1051	},
1042	1052	.ptr_type => \|ptr_type\| {
1043	1053	assert(ptr_type.elem_type != .none);
	1054
	1055	if (ptr_type.size == .Slice) {
	1056	var new_key = key;
	1057	new_key.ptr_type.size = .Many;
	1058	const ptr_ty_index = try get(ip, gpa, new_key);
	1059	try ip.items.ensureUnusedCapacity(gpa, 1);
	1060	ip.items.appendAssumeCapacity(.{
	1061	.tag = .type_slice,
	1062	.data = @enumToInt(ptr_ty_index),
	1063	});
	1064	return @intToEnum(Index, ip.items.len - 1);
	1065	}
	1066
1044	1067	// TODO introduce more pointer encodings
1045	1068	ip.items.appendAssumeCapacity(.{
1046	1069	.tag = .type_pointer,
...	...	@@ -1401,6 +1424,20 @@ pub fn childType(ip: InternPool, i: Index) Index {
1401	1424	};
1402	1425	}
1403	1426
	1427	/// Given a slice type, returns the type of the pointer field.
	1428	pub fn slicePtrType(ip: InternPool, i: Index) Index {
	1429	switch (i) {
	1430	.const_slice_u8_type => return .manyptr_const_u8_type,
	1431	.const_slice_u8_sentinel_0_type => return .manyptr_const_u8_sentinel_0_type,
	1432	else => {},
	1433	}
	1434	const item = ip.items.get(@enumToInt(i));
	1435	switch (item.tag) {
	1436	.type_slice => return @intToEnum(Index, item.data),
	1437	else => unreachable, // not a slice type
	1438	}
	1439	}
	1440
1404	1441	pub fn dump(ip: InternPool) void {
1405	1442	dumpFallible(ip, std.heap.page_allocator) catch return;
1406	1443	}
...	...	@@ -1438,6 +1475,7 @@ fn dumpFallible(ip: InternPool, arena: Allocator) anyerror!void {
1438	1475	.type_array => @sizeOf(Vector),
1439	1476	.type_vector => @sizeOf(Vector),
1440	1477	.type_pointer => @sizeOf(Pointer),
	1478	.type_slice => 0,
1441	1479	.type_optional => 0,
1442	1480	.type_error_union => @sizeOf(ErrorUnion),
1443	1481	.type_enum_simple => @sizeOf(EnumSimple),

src/Module.zig+1-1

...	...	@@ -6553,7 +6553,7 @@ pub fn populateTestFunctions(
6553	6553	}
6554	6554	const decl = mod.declPtr(decl_index);
6555	6555	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
6556		const tmp_test_fn_ty = decl.ty.slicePtrFieldType(&buf).childType(mod);
	6556	const tmp_test_fn_ty = decl.ty.slicePtrFieldType(&buf, mod).childType(mod);
6557	6557
6558	6558	const array_decl_index = d: {
6559	6559	// Add mod.test_functions to an array decl then make the test_functions

src/Sema.zig+6-5

...	...	@@ -24201,7 +24201,7 @@ fn fieldPtr(
24201	24201
24202	24202	if (mem.eql(u8, field_name, "ptr")) {
24203	24203	const buf = try sema.arena.create(Type.SlicePtrFieldTypeBuffer);
24204		const slice_ptr_ty = inner_ty.slicePtrFieldType(buf);
	24204	const slice_ptr_ty = inner_ty.slicePtrFieldType(buf, mod);
24205	24205
24206	24206	const result_ty = try Type.ptr(sema.arena, sema.mod, .{
24207	24207	.pointee_type = slice_ptr_ty,
...	...	@@ -27804,7 +27804,7 @@ fn beginComptimePtrMutation(
27804	27804	sema,
27805	27805	block,
27806	27806	src,
27807		parent.ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer)),
	27807	parent.ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer), mod),
27808	27808	&val_ptr.castTag(.slice).?.data.ptr,
27809	27809	ptr_elem_ty,
27810	27810	parent.decl_ref_mut,
...	...	@@ -27859,7 +27859,7 @@ fn beginComptimePtrMutation(
27859	27859	sema,
27860	27860	block,
27861	27861	src,
27862		parent.ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer)),
	27862	parent.ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer), mod),
27863	27863	&val_ptr.castTag(.slice).?.data.ptr,
27864	27864	ptr_elem_ty,
27865	27865	parent.decl_ref_mut,
...	...	@@ -28256,7 +28256,7 @@ fn beginComptimePtrLoad(
28256	28256	const slice_val = tv.val.castTag(.slice).?.data;
28257	28257	deref.pointee = switch (field_index) {
28258	28258	Value.Payload.Slice.ptr_index => TypedValue{
28259		.ty = field_ptr.container_ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer)),
	28259	.ty = field_ptr.container_ty.slicePtrFieldType(try sema.arena.create(Type.SlicePtrFieldTypeBuffer), mod),
28260	28260	.val = slice_val.ptr,
28261	28261	},
28262	28262	Value.Payload.Slice.len_index => TypedValue{
...	...	@@ -29339,8 +29339,9 @@ fn analyzeSlicePtr(
29339	29339	slice: Air.Inst.Ref,
29340	29340	slice_ty: Type,
29341	29341	) CompileError!Air.Inst.Ref {
	29342	const mod = sema.mod;
29342	29343	const buf = try sema.arena.create(Type.SlicePtrFieldTypeBuffer);
29343		const result_ty = slice_ty.slicePtrFieldType(buf);
	29344	const result_ty = slice_ty.slicePtrFieldType(buf, mod);
29344	29345	if (try sema.resolveMaybeUndefVal(slice)) \|val\| {
29345	29346	if (val.isUndef()) return sema.addConstUndef(result_ty);
29346	29347	return sema.addConstant(result_ty, val.slicePtr());

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

...	...	@@ -3435,7 +3435,7 @@ fn airSliceElemVal(self: *Self, inst: Air.Inst.Index) !void {
3435	3435	const slice_ty = self.typeOf(bin_op.lhs);
3436	3436	const result: MCValue = if (!slice_ty.isVolatilePtr(mod) and self.liveness.isUnused(inst)) .dead else result: {
3437	3437	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
3438		const ptr_ty = slice_ty.slicePtrFieldType(&buf);
	3438	const ptr_ty = slice_ty.slicePtrFieldType(&buf, mod);
3439	3439
3440	3440	const slice_mcv = try self.resolveInst(bin_op.lhs);
3441	3441	const base_mcv = slicePtr(slice_mcv);

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

...	...	@@ -2433,7 +2433,7 @@ fn airSliceElemVal(self: *Self, inst: Air.Inst.Index) !void {
2433	2433	const slice_ty = self.typeOf(bin_op.lhs);
2434	2434	const result: MCValue = if (!slice_ty.isVolatilePtr(mod) and self.liveness.isUnused(inst)) .dead else result: {
2435	2435	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
2436		const ptr_ty = slice_ty.slicePtrFieldType(&buf);
	2436	const ptr_ty = slice_ty.slicePtrFieldType(&buf, mod);
2437	2437
2438	2438	const slice_mcv = try self.resolveInst(bin_op.lhs);
2439	2439	const base_mcv = slicePtr(slice_mcv);

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

...	...	@@ -2462,7 +2462,7 @@ fn airSliceElemVal(self: *Self, inst: Air.Inst.Index) !void {
2462	2462	const elem_size = elem_ty.abiSize(mod);
2463	2463
2464	2464	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
2465		const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf);
	2465	const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf, mod);
2466	2466
2467	2467	const index_lock: ?RegisterLock = if (index_mcv == .register)
2468	2468	self.register_manager.lockRegAssumeUnused(index_mcv.register)

src/arch/x86_64/CodeGen.zig+6-5

...	...	@@ -4056,7 +4056,7 @@ fn genSliceElemPtr(self: *Self, lhs: Air.Inst.Ref, rhs: Air.Inst.Ref) !MCValue {
4056	4056	const elem_ty = slice_ty.childType(mod);
4057	4057	const elem_size = elem_ty.abiSize(mod);
4058	4058	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
4059		const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf);
	4059	const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf, mod);
4060	4060
4061	4061	const index_ty = self.typeOf(rhs);
4062	4062	const index_mcv = try self.resolveInst(rhs);
...	...	@@ -4081,11 +4081,12 @@ fn genSliceElemPtr(self: *Self, lhs: Air.Inst.Ref, rhs: Air.Inst.Ref) !MCValue {
4081	4081	}
4082	4082
4083	4083	fn airSliceElemVal(self: *Self, inst: Air.Inst.Index) !void {
	4084	const mod = self.bin_file.options.module.?;
4084	4085	const bin_op = self.air.instructions.items(.data)[inst].bin_op;
4085	4086	const slice_ty = self.typeOf(bin_op.lhs);
4086	4087
4087	4088	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
4088		const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf);
	4089	const slice_ptr_field_type = slice_ty.slicePtrFieldType(&buf, mod);
4089	4090	const elem_ptr = try self.genSliceElemPtr(bin_op.lhs, bin_op.rhs);
4090	4091	const dst_mcv = try self.allocRegOrMem(inst, false);
4091	4092	try self.load(dst_mcv, slice_ptr_field_type, elem_ptr);
...	...	@@ -8682,7 +8683,7 @@ fn isNull(self: *Self, inst: Air.Inst.Index, opt_ty: Type, opt_mcv: MCValue) !MC
8682	8683
8683	8684	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
8684	8685	const some_info: struct { off: i32, ty: Type } = if (opt_ty.optionalReprIsPayload(mod))
8685		.{ .off = 0, .ty = if (pl_ty.isSlice(mod)) pl_ty.slicePtrFieldType(&ptr_buf) else pl_ty }
	8686	.{ .off = 0, .ty = if (pl_ty.isSlice(mod)) pl_ty.slicePtrFieldType(&ptr_buf, mod) else pl_ty }
8686	8687	else
8687	8688	.{ .off = @intCast(i32, pl_ty.abiSize(mod)), .ty = Type.bool };
8688	8689
...	...	@@ -8774,7 +8775,7 @@ fn isNullPtr(self: *Self, inst: Air.Inst.Index, ptr_ty: Type, ptr_mcv: MCValue)
8774	8775
8775	8776	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
8776	8777	const some_info: struct { off: i32, ty: Type } = if (opt_ty.optionalReprIsPayload(mod))
8777		.{ .off = 0, .ty = if (pl_ty.isSlice(mod)) pl_ty.slicePtrFieldType(&ptr_buf) else pl_ty }
	8778	.{ .off = 0, .ty = if (pl_ty.isSlice(mod)) pl_ty.slicePtrFieldType(&ptr_buf, mod) else pl_ty }
8778	8779	else
8779	8780	.{ .off = @intCast(i32, pl_ty.abiSize(mod)), .ty = Type.bool };
8780	8781
...	...	@@ -10813,7 +10814,7 @@ fn airMemset(self: *Self, inst: Air.Inst.Index, safety: bool) !void {
10813	10814	switch (dst_ptr_ty.ptrSize(mod)) {
10814	10815	.Slice => {
10815	10816	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
10816		const slice_ptr_ty = dst_ptr_ty.slicePtrFieldType(&buf);
	10817	const slice_ptr_ty = dst_ptr_ty.slicePtrFieldType(&buf, mod);
10817	10818
10818	10819	// TODO: this only handles slices stored in the stack
10819	10820	const ptr = dst_ptr;

src/codegen.zig+3-3

...	...	@@ -361,7 +361,7 @@ pub fn generateSymbol(
361	361
362	362	// generate ptr
363	363	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
364		const slice_ptr_field_type = typed_value.ty.slicePtrFieldType(&buf);
	364	const slice_ptr_field_type = typed_value.ty.slicePtrFieldType(&buf, mod);
365	365	switch (try generateSymbol(bin_file, src_loc, .{
366	366	.ty = slice_ptr_field_type,
367	367	.val = slice.ptr,
...	...	@@ -851,7 +851,7 @@ fn lowerParentPtr(
851	851	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
852	852	break :offset switch (field_ptr.field_index) {
853	853	0 => 0,
854		1 => field_ptr.container_ty.slicePtrFieldType(&buf).abiSize(mod),
	854	1 => field_ptr.container_ty.slicePtrFieldType(&buf, mod).abiSize(mod),
855	855	else => unreachable,
856	856	};
857	857	},
...	...	@@ -951,7 +951,7 @@ fn lowerDeclRef(
951	951	if (typed_value.ty.isSlice(mod)) {
952	952	// generate ptr
953	953	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
954		const slice_ptr_field_type = typed_value.ty.slicePtrFieldType(&buf);
	954	const slice_ptr_field_type = typed_value.ty.slicePtrFieldType(&buf, mod);
955	955	switch (try generateSymbol(bin_file, src_loc, .{
956	956	.ty = slice_ptr_field_type,
957	957	.val = typed_value.val,

src/codegen/c.zig+7-6

...	...	@@ -566,7 +566,7 @@ pub const DeclGen = struct {
566	566	}
567	567
568	568	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
569		try dg.renderValue(writer, ty.slicePtrFieldType(&buf), val.slicePtr(), .Initializer);
	569	try dg.renderValue(writer, ty.slicePtrFieldType(&buf, mod), val.slicePtr(), .Initializer);
570	570
571	571	var len_pl: Value.Payload.U64 = .{
572	572	.base = .{ .tag = .int_u64 },
...	...	@@ -787,7 +787,7 @@ pub const DeclGen = struct {
787	787
788	788	try writer.writeAll("{(");
789	789	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
790		const ptr_ty = ty.slicePtrFieldType(&buf);
	790	const ptr_ty = ty.slicePtrFieldType(&buf, mod);
791	791	try dg.renderType(writer, ptr_ty);
792	792	return writer.print("){x}, {0x}}}", .{try dg.fmtIntLiteral(Type.usize, val, .Other)});
793	793	} else {
...	...	@@ -1088,7 +1088,7 @@ pub const DeclGen = struct {
1088	1088	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
1089	1089
1090	1090	try writer.writeByte('{');
1091		try dg.renderValue(writer, ty.slicePtrFieldType(&buf), slice.ptr, initializer_type);
	1091	try dg.renderValue(writer, ty.slicePtrFieldType(&buf, mod), slice.ptr, initializer_type);
1092	1092	try writer.writeAll(", ");
1093	1093	try dg.renderValue(writer, Type.usize, slice.len, initializer_type);
1094	1094	try writer.writeByte('}');
...	...	@@ -4107,6 +4107,7 @@ fn airMinMax(f: *Function, inst: Air.Inst.Index, operator: u8, operation: []cons
4107	4107	}
4108	4108
4109	4109	fn airSlice(f: *Function, inst: Air.Inst.Index) !CValue {
	4110	const mod = f.object.dg.module;
4110	4111	const ty_pl = f.air.instructions.items(.data)[inst].ty_pl;
4111	4112	const bin_op = f.air.extraData(Air.Bin, ty_pl.payload).data;
4112	4113
...	...	@@ -4116,7 +4117,7 @@ fn airSlice(f: *Function, inst: Air.Inst.Index) !CValue {
4116	4117
4117	4118	const inst_ty = f.typeOfIndex(inst);
4118	4119	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
4119		const ptr_ty = inst_ty.slicePtrFieldType(&buf);
	4120	const ptr_ty = inst_ty.slicePtrFieldType(&buf, mod);
4120	4121
4121	4122	const writer = f.object.writer();
4122	4123	const local = try f.allocLocal(inst, inst_ty);
...	...	@@ -5112,7 +5113,7 @@ fn airIsNull(
5112	5113	TypedValue{ .ty = payload_ty, .val = Value.zero }
5113	5114	else if (payload_ty.isSlice(mod) and optional_ty.optionalReprIsPayload(mod)) rhs: {
5114	5115	try writer.writeAll(".ptr");
5115		const slice_ptr_ty = payload_ty.slicePtrFieldType(&slice_ptr_buf);
	5116	const slice_ptr_ty = payload_ty.slicePtrFieldType(&slice_ptr_buf, mod);
5116	5117	break :rhs TypedValue{ .ty = slice_ptr_ty, .val = Value.null };
5117	5118	} else rhs: {
5118	5119	try writer.writeAll(".is_null");
...	...	@@ -5845,7 +5846,7 @@ fn airArrayToSlice(f: *Function, inst: Air.Inst.Index) !CValue {
5845	5846	// &((void )p)[0], although LLVM does via GetElementPtr
5846	5847	if (operand == .undef) {
5847	5848	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
5848		try f.writeCValue(writer, .{ .undef = inst_ty.slicePtrFieldType(&buf) }, .Initializer);
	5849	try f.writeCValue(writer, .{ .undef = inst_ty.slicePtrFieldType(&buf, mod) }, .Initializer);
5849	5850	} else if (array_ty.hasRuntimeBitsIgnoreComptime(mod)) {
5850	5851	try writer.writeAll("&(");
5851	5852	try f.writeCValueDeref(writer, operand);

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

...	...	@@ -1432,7 +1432,7 @@ pub const CType = extern union {
1432	1432	.payload => unreachable,
1433	1433	}) \|fwd_idx\| {
1434	1434	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
1435		const ptr_ty = ty.slicePtrFieldType(&buf);
	1435	const ptr_ty = ty.slicePtrFieldType(&buf, mod);
1436	1436	if (try lookup.typeToIndex(ptr_ty, kind)) \|ptr_idx\| {
1437	1437	self.storage = .{ .anon = undefined };
1438	1438	self.storage.anon.fields[0] = .{

src/codegen/llvm.zig+7-7

...	...	@@ -1638,7 +1638,7 @@ pub const Object = struct {
1638	1638
1639	1639	if (ty.isSlice(mod)) {
1640	1640	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
1641		const ptr_ty = ty.slicePtrFieldType(&buf);
	1641	const ptr_ty = ty.slicePtrFieldType(&buf, mod);
1642	1642	const len_ty = Type.usize;
1643	1643
1644	1644	const name = try ty.nameAlloc(gpa, o.module);
...	...	@@ -2822,7 +2822,7 @@ pub const DeclGen = struct {
2822	2822	.Pointer => {
2823	2823	if (t.isSlice(mod)) {
2824	2824	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
2825		const ptr_type = t.slicePtrFieldType(&buf);
	2825	const ptr_type = t.slicePtrFieldType(&buf, mod);
2826	2826
2827	2827	const fields: [2]*llvm.Type = .{
2828	2828	try dg.lowerType(ptr_type),
...	...	@@ -3182,9 +3182,9 @@ pub const DeclGen = struct {
3182	3182	const param_ty = fn_info.param_types[it.zig_index - 1];
3183	3183	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
3184	3184	const ptr_ty = if (param_ty.zigTypeTag(mod) == .Optional)
3185		param_ty.optionalChild(mod).slicePtrFieldType(&buf)
	3185	param_ty.optionalChild(mod).slicePtrFieldType(&buf, mod)
3186	3186	else
3187		param_ty.slicePtrFieldType(&buf);
	3187	param_ty.slicePtrFieldType(&buf, mod);
3188	3188	const ptr_llvm_ty = try dg.lowerType(ptr_ty);
3189	3189	const len_llvm_ty = try dg.lowerType(Type.usize);
3190	3190
...	...	@@ -3387,7 +3387,7 @@ pub const DeclGen = struct {
3387	3387	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
3388	3388	const fields: [2]*llvm.Value = .{
3389	3389	try dg.lowerValue(.{
3390		.ty = tv.ty.slicePtrFieldType(&buf),
	3390	.ty = tv.ty.slicePtrFieldType(&buf, mod),
3391	3391	.val = slice.ptr,
3392	3392	}),
3393	3393	try dg.lowerValue(.{
...	...	@@ -4169,7 +4169,7 @@ pub const DeclGen = struct {
4169	4169	const mod = self.module;
4170	4170	if (tv.ty.isSlice(mod)) {
4171	4171	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
4172		const ptr_ty = tv.ty.slicePtrFieldType(&buf);
	4172	const ptr_ty = tv.ty.slicePtrFieldType(&buf, mod);
4173	4173	var slice_len: Value.Payload.U64 = .{
4174	4174	.base = .{ .tag = .int_u64 },
4175	4175	.data = tv.val.sliceLen(mod),
...	...	@@ -6654,7 +6654,7 @@ pub const FuncGen = struct {
6654	6654	if (payload_ty.isSlice(mod)) {
6655	6655	const slice_ptr = self.builder.buildExtractValue(loaded, 0, "");
6656	6656	var slice_buf: Type.SlicePtrFieldTypeBuffer = undefined;
6657		const ptr_ty = try self.dg.lowerType(payload_ty.slicePtrFieldType(&slice_buf));
	6657	const ptr_ty = try self.dg.lowerType(payload_ty.slicePtrFieldType(&slice_buf, mod));
6658	6658	return self.builder.buildICmp(pred, slice_ptr, ptr_ty.constNull(), "");
6659	6659	}
6660	6660	return self.builder.buildICmp(pred, loaded, optional_llvm_ty.constNull(), "");

src/codegen/spirv.zig+3-3

...	...	@@ -669,7 +669,7 @@ pub const DeclGen = struct {
669	669	const slice = val.castTag(.slice).?.data;
670	670
671	671	var buf: Type.SlicePtrFieldTypeBuffer = undefined;
672		const ptr_ty = ty.slicePtrFieldType(&buf);
	672	const ptr_ty = ty.slicePtrFieldType(&buf, mod);
673	673
674	674	try self.lower(ptr_ty, slice.ptr);
675	675	try self.addInt(Type.usize, slice.len);
...	...	@@ -2489,7 +2489,7 @@ pub const DeclGen = struct {
2489	2489	const index_id = try self.resolve(bin_op.rhs);
2490	2490
2491	2491	var slice_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2492		const ptr_ty = slice_ty.slicePtrFieldType(&slice_buf);
	2492	const ptr_ty = slice_ty.slicePtrFieldType(&slice_buf, mod);
2493	2493	const ptr_ty_ref = try self.resolveType(ptr_ty, .direct);
2494	2494
2495	2495	const slice_ptr = try self.extractField(ptr_ty, slice_id, 0);
...	...	@@ -2987,7 +2987,7 @@ pub const DeclGen = struct {
2987	2987
2988	2988	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2989	2989	const ptr_ty = if (payload_ty.isSlice(mod))
2990		payload_ty.slicePtrFieldType(&ptr_buf)
	2990	payload_ty.slicePtrFieldType(&ptr_buf, mod)
2991	2991	else
2992	2992	payload_ty;
2993	2993

src/link/Dwarf.zig+1-1

...	...	@@ -278,7 +278,7 @@ pub const DeclState = struct {
278	278	var index = dbg_info_buffer.items.len;
279	279	try dbg_info_buffer.resize(index + 4);
280	280	var buf = try arena.create(Type.SlicePtrFieldTypeBuffer);
281		const ptr_ty = ty.slicePtrFieldType(buf);
	281	const ptr_ty = ty.slicePtrFieldType(buf, mod);
282	282	try self.addTypeRelocGlobal(atom_index, ptr_ty, @intCast(u32, index));
283	283	// DW.AT.data_member_location, DW.FORM.udata
284	284	try dbg_info_buffer.ensureUnusedCapacity(6);

src/type.zig+40-26

...	...	@@ -2042,7 +2042,18 @@ pub const Type = struct {
2042	2042	else => unreachable,
2043	2043	},
2044	2044	else => switch (mod.intern_pool.indexToKey(ty.ip_index)) {
2045		else => @panic("TODO"),
	2045	.ptr_type => \|ptr_type\| {
	2046	if (ptr_type.alignment != 0) {
	2047	return @intCast(u32, ptr_type.alignment);
	2048	} else if (opt_sema) \|sema\| {
	2049	const res = try ptr_type.elem_type.toType().abiAlignmentAdvanced(mod, .{ .sema = sema });
	2050	return res.scalar;
	2051	} else {
	2052	return (ptr_type.elem_type.toType().abiAlignmentAdvanced(mod, .eager) catch unreachable).scalar;
	2053	}
	2054	},
	2055	.opt_type => \|child\| return child.toType().ptrAlignmentAdvanced(mod, opt_sema),
	2056	else => unreachable,
2046	2057	},
2047	2058	}
2048	2059	}
...	...	@@ -3060,33 +3071,36 @@ pub const Type = struct {
3060	3071	pointer: Payload.Pointer,
3061	3072	};
3062	3073
3063		pub fn slicePtrFieldType(self: Type, buffer: *SlicePtrFieldTypeBuffer) Type {
3064		switch (self.tag()) {
3065		.pointer => {
3066		const payload = self.castTag(.pointer).?.data;
3067		assert(payload.size == .Slice);
3068
3069		buffer.* = .{
3070		.pointer = .{
3071		.data = .{
3072		.pointee_type = payload.pointee_type,
3073		.sentinel = payload.sentinel,
3074		.@"align" = payload.@"align",
3075		.@"addrspace" = payload.@"addrspace",
3076		.bit_offset = payload.bit_offset,
3077		.host_size = payload.host_size,
3078		.vector_index = payload.vector_index,
3079		.@"allowzero" = payload.@"allowzero",
3080		.mutable = payload.mutable,
3081		.@"volatile" = payload.@"volatile",
3082		.size = .Many,
	3074	pub fn slicePtrFieldType(ty: Type, buffer: SlicePtrFieldTypeBuffer, mod: const Module) Type {
	3075	switch (ty.ip_index) {
	3076	.none => switch (ty.tag()) {
	3077	.pointer => {
	3078	const payload = ty.castTag(.pointer).?.data;
	3079	assert(payload.size == .Slice);
	3080
	3081	buffer.* = .{
	3082	.pointer = .{
	3083	.data = .{
	3084	.pointee_type = payload.pointee_type,
	3085	.sentinel = payload.sentinel,
	3086	.@"align" = payload.@"align",
	3087	.@"addrspace" = payload.@"addrspace",
	3088	.bit_offset = payload.bit_offset,
	3089	.host_size = payload.host_size,
	3090	.vector_index = payload.vector_index,
	3091	.@"allowzero" = payload.@"allowzero",
	3092	.mutable = payload.mutable,
	3093	.@"volatile" = payload.@"volatile",
	3094	.size = .Many,
	3095	},
3083	3096	},
3084		},
3085		};
3086		return Type.initPayload(&buffer.pointer.base);
3087		},
	3097	};
	3098	return Type.initPayload(&buffer.pointer.base);
	3099	},
3088	3100
3089		else => unreachable,
	3101	else => unreachable,
	3102	},
	3103	else => return mod.intern_pool.slicePtrType(ty.ip_index).toType(),
3090	3104	}
3091	3105	}
3092	3106

src/value.zig+4-4

...	...	@@ -2078,7 +2078,7 @@ pub const Value = struct {
2078	2078	}
2079	2079
2080	2080	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2081		const ptr_ty = ty.slicePtrFieldType(&ptr_buf);
	2081	const ptr_ty = ty.slicePtrFieldType(&ptr_buf, mod);
2082	2082
2083	2083	return eqlAdvanced(a_payload.ptr, ptr_ty, b_payload.ptr, ptr_ty, mod, opt_sema);
2084	2084	},
...	...	@@ -2237,7 +2237,7 @@ pub const Value = struct {
2237	2237	}
2238	2238
2239	2239	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2240		const ptr_ty = ty.slicePtrFieldType(&ptr_buf);
	2240	const ptr_ty = ty.slicePtrFieldType(&ptr_buf, mod);
2241	2241	const a_ptr = switch (a_ty.ptrSize(mod)) {
2242	2242	.Slice => a.slicePtr(),
2243	2243	.One => a,
...	...	@@ -2376,7 +2376,7 @@ pub const Value = struct {
2376	2376	.slice => {
2377	2377	const slice = val.castTag(.slice).?.data;
2378	2378	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2379		const ptr_ty = ty.slicePtrFieldType(&ptr_buf);
	2379	const ptr_ty = ty.slicePtrFieldType(&ptr_buf, mod);
2380	2380	hash(slice.ptr, ptr_ty, hasher, mod);
2381	2381	hash(slice.len, Type.usize, hasher, mod);
2382	2382	},
...	...	@@ -2499,7 +2499,7 @@ pub const Value = struct {
2499	2499	.slice => {
2500	2500	const slice = val.castTag(.slice).?.data;
2501	2501	var ptr_buf: Type.SlicePtrFieldTypeBuffer = undefined;
2502		const ptr_ty = ty.slicePtrFieldType(&ptr_buf);
	2502	const ptr_ty = ty.slicePtrFieldType(&ptr_buf, mod);
2503	2503	slice.ptr.hashUncoerced(ptr_ty, hasher, mod);
2504	2504	},
2505	2505	else => val.hashPtr(hasher, mod),

author	Andrew Kelley <andrew@ziglang.org> 2023-05-05 19:13:43-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-06-10 20:42:29-07:00
log	31aee50c1a96b7e72b42ee885636b27fbcac8eb4
tree	ddd17a80a48fa620a6d4cea9d8f6a970eb90845d
parent	08e97639513f09e2797bd7afcdfdfecdad6c6fd8

InternPool: add a slice encoding