diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2024-03-19 12:27:20 +0100 |
|---|---|---|
| committer | Jacob Young <jacobly0@users.noreply.github.com> | 2024-03-30 20:50:48 -0400 |
| commit | e409afb79bcadeabd2d5d4cc3cd5dcc54a964e94 (patch) | |
| tree | d09f9cc93ce8c44e5769e9124a0bd488a257345e /src | |
| parent | 9b2345e182090e2f4c57e7684ec9739f195fdb1d (diff) | |
| download | zig-e409afb79bcadeabd2d5d4cc3cd5dcc54a964e94.tar.gz zig-e409afb79bcadeabd2d5d4cc3cd5dcc54a964e94.zip | |
Update uses of `@fieldParentPtr` to pass a pointer type
Diffstat (limited to 'src')
| -rw-r--r-- | src/link.zig | 46 | ||||
| -rw-r--r-- | src/link/tapi/parse.zig | 18 | ||||
| -rw-r--r-- | src/register_manager.zig | 2 |
3 files changed, 33 insertions, 33 deletions
diff --git a/src/link.zig b/src/link.zig index 9e1daa09af..8ccd68fb65 100644 --- a/src/link.zig +++ b/src/link.zig @@ -226,7 +226,7 @@ pub const File = struct { if (base.tag != T.base_tag) return null; - return @fieldParentPtr(T, "base", base); + return @fieldParentPtr(*T, "base", base); } pub fn makeWritable(base: *File) !void { @@ -383,7 +383,7 @@ pub const File = struct { .c => unreachable, .nvptx => unreachable, inline else => |t| { - return @fieldParentPtr(t.Type(), "base", base).lowerUnnamedConst(val, decl_index); + return @fieldParentPtr(*t.Type(), "base", base).lowerUnnamedConst(val, decl_index); }, } } @@ -402,7 +402,7 @@ pub const File = struct { .c => unreachable, .nvptx => unreachable, inline else => |t| { - return @fieldParentPtr(t.Type(), "base", base).getGlobalSymbol(name, lib_name); + return @fieldParentPtr(*t.Type(), "base", base).getGlobalSymbol(name, lib_name); }, } } @@ -413,11 +413,11 @@ pub const File = struct { assert(decl.has_tv); switch (base.tag) { .c => { - return @fieldParentPtr(C, "base", base).updateDecl(module, decl_index); + return @fieldParentPtr(*C, "base", base).updateDecl(module, decl_index); }, inline else => |tag| { if (build_options.only_c) unreachable; - return @fieldParentPtr(tag.Type(), "base", base).updateDecl(module, decl_index); + return @fieldParentPtr(*tag.Type(), "base", base).updateDecl(module, decl_index); }, } } @@ -432,11 +432,11 @@ pub const File = struct { ) UpdateDeclError!void { switch (base.tag) { .c => { - return @fieldParentPtr(C, "base", base).updateFunc(module, func_index, air, liveness); + return @fieldParentPtr(*C, "base", base).updateFunc(module, func_index, air, liveness); }, inline else => |tag| { if (build_options.only_c) unreachable; - return @fieldParentPtr(tag.Type(), "base", base).updateFunc(module, func_index, air, liveness); + return @fieldParentPtr(*tag.Type(), "base", base).updateFunc(module, func_index, air, liveness); }, } } @@ -447,11 +447,11 @@ pub const File = struct { switch (base.tag) { .spirv, .nvptx => {}, .c => { - return @fieldParentPtr(C, "base", base).updateDeclLineNumber(module, decl_index); + return @fieldParentPtr(*C, "base", base).updateDeclLineNumber(module, decl_index); }, inline else => |tag| { if (build_options.only_c) unreachable; - return @fieldParentPtr(tag.Type(), "base", base).updateDeclLineNumber(module, decl_index); + return @fieldParentPtr(*tag.Type(), "base", base).updateDeclLineNumber(module, decl_index); }, } } @@ -473,11 +473,11 @@ pub const File = struct { base.releaseLock(); if (base.file) |f| f.close(); switch (base.tag) { - .c => @fieldParentPtr(C, "base", base).deinit(), + .c => @fieldParentPtr(*C, "base", base).deinit(), inline else => |tag| { if (build_options.only_c) unreachable; - @fieldParentPtr(tag.Type(), "base", base).deinit(); + @fieldParentPtr(*tag.Type(), "base", base).deinit(); }, } } @@ -560,7 +560,7 @@ pub const File = struct { pub fn flush(base: *File, arena: Allocator, prog_node: *std.Progress.Node) FlushError!void { if (build_options.only_c) { assert(base.tag == .c); - return @fieldParentPtr(C, "base", base).flush(arena, prog_node); + return @fieldParentPtr(*C, "base", base).flush(arena, prog_node); } const comp = base.comp; if (comp.clang_preprocessor_mode == .yes or comp.clang_preprocessor_mode == .pch) { @@ -587,7 +587,7 @@ pub const File = struct { } switch (base.tag) { inline else => |tag| { - return @fieldParentPtr(tag.Type(), "base", base).flush(arena, prog_node); + return @fieldParentPtr(*tag.Type(), "base", base).flush(arena, prog_node); }, } } @@ -597,11 +597,11 @@ pub const File = struct { pub fn flushModule(base: *File, arena: Allocator, prog_node: *std.Progress.Node) FlushError!void { switch (base.tag) { .c => { - return @fieldParentPtr(C, "base", base).flushModule(arena, prog_node); + return @fieldParentPtr(*C, "base", base).flushModule(arena, prog_node); }, inline else => |tag| { if (build_options.only_c) unreachable; - return @fieldParentPtr(tag.Type(), "base", base).flushModule(arena, prog_node); + return @fieldParentPtr(*tag.Type(), "base", base).flushModule(arena, prog_node); }, } } @@ -610,11 +610,11 @@ pub const File = struct { pub fn freeDecl(base: *File, decl_index: InternPool.DeclIndex) void { switch (base.tag) { .c => { - @fieldParentPtr(C, "base", base).freeDecl(decl_index); + @fieldParentPtr(*C, "base", base).freeDecl(decl_index); }, inline else => |tag| { if (build_options.only_c) unreachable; - @fieldParentPtr(tag.Type(), "base", base).freeDecl(decl_index); + @fieldParentPtr(*tag.Type(), "base", base).freeDecl(decl_index); }, } } @@ -636,11 +636,11 @@ pub const File = struct { ) UpdateExportsError!void { switch (base.tag) { .c => { - return @fieldParentPtr(C, "base", base).updateExports(module, exported, exports); + return @fieldParentPtr(*C, "base", base).updateExports(module, exported, exports); }, inline else => |tag| { if (build_options.only_c) unreachable; - return @fieldParentPtr(tag.Type(), "base", base).updateExports(module, exported, exports); + return @fieldParentPtr(*tag.Type(), "base", base).updateExports(module, exported, exports); }, } } @@ -664,7 +664,7 @@ pub const File = struct { .spirv => unreachable, .nvptx => unreachable, inline else => |tag| { - return @fieldParentPtr(tag.Type(), "base", base).getDeclVAddr(decl_index, reloc_info); + return @fieldParentPtr(*tag.Type(), "base", base).getDeclVAddr(decl_index, reloc_info); }, } } @@ -683,7 +683,7 @@ pub const File = struct { .spirv => unreachable, .nvptx => unreachable, inline else => |tag| { - return @fieldParentPtr(tag.Type(), "base", base).lowerAnonDecl(decl_val, decl_align, src_loc); + return @fieldParentPtr(*tag.Type(), "base", base).lowerAnonDecl(decl_val, decl_align, src_loc); }, } } @@ -695,7 +695,7 @@ pub const File = struct { .spirv => unreachable, .nvptx => unreachable, inline else => |tag| { - return @fieldParentPtr(tag.Type(), "base", base).getAnonDeclVAddr(decl_val, reloc_info); + return @fieldParentPtr(*tag.Type(), "base", base).getAnonDeclVAddr(decl_val, reloc_info); }, } } @@ -714,7 +714,7 @@ pub const File = struct { => {}, inline else => |tag| { - return @fieldParentPtr(tag.Type(), "base", base).deleteDeclExport(decl_index, name); + return @fieldParentPtr(*tag.Type(), "base", base).deleteDeclExport(decl_index, name); }, } } diff --git a/src/link/tapi/parse.zig b/src/link/tapi/parse.zig index 89e0b23824..796cd8ab6a 100644 --- a/src/link/tapi/parse.zig +++ b/src/link/tapi/parse.zig @@ -35,28 +35,28 @@ pub const Node = struct { if (self.tag != T.base_tag) { return null; } - return @fieldParentPtr(T, "base", self); + return @fieldParentPtr(*const T, "base", self); } pub fn deinit(self: *Node, allocator: Allocator) void { switch (self.tag) { .doc => { - const parent = @fieldParentPtr(Node.Doc, "base", self); + const parent = @fieldParentPtr(*Node.Doc, "base", self); parent.deinit(allocator); allocator.destroy(parent); }, .map => { - const parent = @fieldParentPtr(Node.Map, "base", self); + const parent = @fieldParentPtr(*Node.Map, "base", self); parent.deinit(allocator); allocator.destroy(parent); }, .list => { - const parent = @fieldParentPtr(Node.List, "base", self); + const parent = @fieldParentPtr(*Node.List, "base", self); parent.deinit(allocator); allocator.destroy(parent); }, .value => { - const parent = @fieldParentPtr(Node.Value, "base", self); + const parent = @fieldParentPtr(*Node.Value, "base", self); parent.deinit(allocator); allocator.destroy(parent); }, @@ -70,10 +70,10 @@ pub const Node = struct { writer: anytype, ) !void { return switch (self.tag) { - .doc => @fieldParentPtr(Node.Doc, "base", self).format(fmt, options, writer), - .map => @fieldParentPtr(Node.Map, "base", self).format(fmt, options, writer), - .list => @fieldParentPtr(Node.List, "base", self).format(fmt, options, writer), - .value => @fieldParentPtr(Node.Value, "base", self).format(fmt, options, writer), + .doc => @fieldParentPtr(*Node.Doc, "base", self).format(fmt, options, writer), + .map => @fieldParentPtr(*Node.Map, "base", self).format(fmt, options, writer), + .list => @fieldParentPtr(*Node.List, "base", self).format(fmt, options, writer), + .value => @fieldParentPtr(*Node.Value, "base", self).format(fmt, options, writer), }; } diff --git a/src/register_manager.zig b/src/register_manager.zig index 62aeb78fc7..333499f142 100644 --- a/src/register_manager.zig +++ b/src/register_manager.zig @@ -59,7 +59,7 @@ pub fn RegisterManager( pub const RegisterBitSet = StaticBitSet(tracked_registers.len); fn getFunction(self: *Self) *Function { - return @fieldParentPtr(Function, "register_manager", self); + return @alignCast(@fieldParentPtr(*align(1) Function, "register_manager", self)); } fn excludeRegister(reg: Register, register_class: RegisterBitSet) bool { |
