mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-10 09:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove some stale code

Browse Source 
- Don't create an `inner_sema` in `unionFields`
- Remove assertions of the sema owner, when we literally just set it
This commit is contained in:
David Rubin 2024-08-26 12:27:34 -07:00
parent f777b29832
commit 61e8a6c008
No known key found for this signature in database
GPG Key ID: 2EBEA24BA674C720
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/InternPool.zig
View File

@ -457,7 +457,7 @@ pub const Cau = struct {
unwrapped.index);
}
};
pub fn unwrap(cau_index: Cau.Index, ip: *const InternPool) Unwrapped {
fn unwrap(cau_index: Cau.Index, ip: *const InternPool) Unwrapped {
return .{
.tid = @enumFromInt(@intFromEnum(cau_index) >> ip.tid_shift_31 & ip.getTidMask()),
.index = @intFromEnum(cau_index) & ip.getIndexMask(u31),
@ -1464,7 +1464,7 @@ pub const NamespaceIndex = enum(u32) {
unwrapped.index);
}
};
pub fn unwrap(namespace_index: NamespaceIndex, ip: *const InternPool) Unwrapped {
fn unwrap(namespace_index: NamespaceIndex, ip: *const InternPool) Unwrapped {
const index = @intFromEnum(namespace_index) & ip.getIndexMask(u32);
return .{
.tid = @enumFromInt(@intFromEnum(namespace_index) >> ip.tid_shift_32 & ip.getTidMask()),

31
src/Sema.zig
View File

@ -35458,9 +35458,6 @@ fn backingIntType(
var analysis_arena = std.heap.ArenaAllocator.init(gpa);
defer analysis_arena.deinit();
var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
defer comptime_err_ret_trace.deinit();
var block: Block = .{
.parent = null,
.sema = sema,
@ -36114,9 +36111,6 @@ fn structFields(
},
};
var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
defer comptime_err_ret_trace.deinit();
var block_scope: Block = .{
.parent = null,
.sema = sema,
@ -36300,7 +36294,6 @@ fn structFieldInits(
) CompileError!void {
const pt = sema.pt;
const zcu = pt.zcu;
const gpa = zcu.gpa;
const ip = &zcu.intern_pool;
assert(!struct_type.haveFieldInits(ip));
@ -36311,9 +36304,6 @@ fn structFieldInits(
const zir_index = struct_type.zir_index.unwrap().?.resolve(ip) orelse return error.AnalysisFail;
const fields_len, const small, var extra_index = structZirInfo(zir, zir_index);
var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
defer comptime_err_ret_trace.deinit();
var block_scope: Block = .{
.parent = null,
.sema = sema,
@ -36475,28 +36465,9 @@ fn unionFields(
const body = zir.bodySlice(extra_index, body_len);
extra_index += body.len;
var comptime_err_ret_trace = std.ArrayList(LazySrcLoc).init(gpa);
defer comptime_err_ret_trace.deinit();
const cau_index = union_type.cau;
var inner_sema: Sema = .{
.pt = pt,
.gpa = gpa,
.arena = sema.arena,
.code = zir,
.owner = AnalUnit.wrap(.{ .cau = cau_index }),
.func_index = .none,
.func_is_naked = false,
.fn_ret_ty = Type.void,
.fn_ret_ty_ies = null,
.comptime_err_ret_trace = &comptime_err_ret_trace,
};
defer inner_sema.deinit();
var block_scope: Block = .{
.parent = null,
.sema = &inner_sema,
.sema = sema,
.namespace = union_type.namespace,
.instructions = .{},
.inlining = null,

4
src/Type.zig
View File

@ -3926,8 +3926,6 @@ fn resolveStructInner(
};
defer sema.deinit();
assert(sema.owner.unwrap().cau == struct_obj.cau.unwrap().?);
(switch (resolution) {
.fields => sema.resolveStructFieldTypes(ty.toIntern(), struct_obj),
.inits => sema.resolveStructFieldInits(ty),
@ -3982,8 +3980,6 @@ fn resolveUnionInner(
};
defer sema.deinit();
assert(sema.owner.unwrap().cau == union_obj.cau);
(switch (resolution) {
.fields => sema.resolveUnionFieldTypes(ty, union_obj),
.alignment => sema.resolveUnionAlignment(ty, union_obj),