Commit 61e8a6c0082778e9d7a120fb5b9c30ebf85d586b | zig

author	David Rubin <david@vortan.dev> 2024-08-26 12:27:34-07:00
committer	David Rubin <david@vortan.dev> 2024-08-26 12:27:34-07:00
log	61e8a6c0082778e9d7a120fb5b9c30ebf85d586b
tree	68a56acd898e308845054123f0cf6816761d3fa1
parent	f777b298327de95d2a54d814ca562c08fd7c7a87
signature	Commit is signed but in an unrecognized format.

remove some stale code

- Don't create an `inner_sema` in `unionFields`
- Remove assertions of the sema owner, when we literally just set it

3 files changed, 3 insertions(+), 36 deletions(-)

src/InternPool.zig+2-2

...	...	@@ -457,7 +457,7 @@ pub const Cau = struct {
457	457	unwrapped.index);
458	458	}
459	459	};
460		pub fn unwrap(cau_index: Cau.Index, ip: *const InternPool) Unwrapped {
	460	fn unwrap(cau_index: Cau.Index, ip: *const InternPool) Unwrapped {
461	461	return .{
462	462	.tid = @enumFromInt(@intFromEnum(cau_index) >> ip.tid_shift_31 & ip.getTidMask()),
463	463	.index = @intFromEnum(cau_index) & ip.getIndexMask(u31),
...	...	@@ -1464,7 +1464,7 @@ pub const NamespaceIndex = enum(u32) {
1464	1464	unwrapped.index);
1465	1465	}
1466	1466	};
1467		pub fn unwrap(namespace_index: NamespaceIndex, ip: *const InternPool) Unwrapped {
	1467	fn unwrap(namespace_index: NamespaceIndex, ip: *const InternPool) Unwrapped {
1468	1468	const index = @intFromEnum(namespace_index) & ip.getIndexMask(u32);
1469	1469	return .{
1470	1470	.tid = @enumFromInt(@intFromEnum(namespace_index) >> ip.tid_shift_32 & ip.getTidMask()),

src/Sema.zig+1-30

...	...	@@ -35458,9 +35458,6 @@ fn backingIntType(
35458	35458	var analysis_arena = std.heap.ArenaAllocator.init(gpa);
35459	35459	defer analysis_arena.deinit();
35460	35460
35461		var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
35462		defer comptime_err_ret_trace.deinit();
35463
35464	35461	var block: Block = .{
35465	35462	.parent = null,
35466	35463	.sema = sema,
...	...	@@ -36114,9 +36111,6 @@ fn structFields(
36114	36111	},
36115	36112	};
36116	36113
36117		var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
36118		defer comptime_err_ret_trace.deinit();
36119
36120	36114	var block_scope: Block = .{
36121	36115	.parent = null,
36122	36116	.sema = sema,
...	...	@@ -36300,7 +36294,6 @@ fn structFieldInits(
36300	36294	) CompileError!void {
36301	36295	const pt = sema.pt;
36302	36296	const zcu = pt.zcu;
36303		const gpa = zcu.gpa;
36304	36297	const ip = &zcu.intern_pool;
36305	36298
36306	36299	assert(!struct_type.haveFieldInits(ip));
...	...	@@ -36311,9 +36304,6 @@ fn structFieldInits(
36311	36304	const zir_index = struct_type.zir_index.unwrap().?.resolve(ip) orelse return error.AnalysisFail;
36312	36305	const fields_len, const small, var extra_index = structZirInfo(zir, zir_index);
36313	36306
36314		var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
36315		defer comptime_err_ret_trace.deinit();
36316
36317	36307	var block_scope: Block = .{
36318	36308	.parent = null,
36319	36309	.sema = sema,
...	...	@@ -36475,28 +36465,9 @@ fn unionFields(
36475	36465	const body = zir.bodySlice(extra_index, body_len);
36476	36466	extra_index += body.len;
36477	36467
36478		var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
36479		defer comptime_err_ret_trace.deinit();
36480
36481		const cau_index = union_type.cau;
36482
36483		var inner_sema: Sema = .{
36484		.pt = pt,
36485		.gpa = gpa,
36486		.arena = sema.arena,
36487		.code = zir,
36488		.owner = AnalUnit.wrap(.{ .cau = cau_index }),
36489		.func_index = .none,
36490		.func_is_naked = false,
36491		.fn_ret_ty = Type.void,
36492		.fn_ret_ty_ies = null,
36493		.comptime_err_ret_trace = &comptime_err_ret_trace,
36494		};
36495		defer inner_sema.deinit();
36496
36497	36468	var block_scope: Block = .{
36498	36469	.parent = null,
36499		.sema = &inner_sema,
	36470	.sema = sema,
36500	36471	.namespace = union_type.namespace,
36501	36472	.instructions = .{},
36502	36473	.inlining = null,

src/Type.zig-4

...	...	@@ -3926,8 +3926,6 @@ fn resolveStructInner(
3926	3926	};
3927	3927	defer sema.deinit();
3928	3928
3929		assert(sema.owner.unwrap().cau == struct_obj.cau.unwrap().?);
3930
3931	3929	(switch (resolution) {
3932	3930	.fields => sema.resolveStructFieldTypes(ty.toIntern(), struct_obj),
3933	3931	.inits => sema.resolveStructFieldInits(ty),
...	...	@@ -3982,8 +3980,6 @@ fn resolveUnionInner(
3982	3980	};
3983	3981	defer sema.deinit();
3984	3982
3985		assert(sema.owner.unwrap().cau == union_obj.cau);
3986
3987	3983	(switch (resolution) {
3988	3984	.fields => sema.resolveUnionFieldTypes(ty, union_obj),
3989	3985	.alignment => sema.resolveUnionAlignment(ty, union_obj),