From b3bb6d923fef98b0b0da8f0848e235b06a9e473f Mon Sep 17 00:00:00 2001 From: Mason Remaley Date: Mon, 20 Jul 2026 17:07:30 -0700 Subject: [PATCH] Update calls to Zoir API --- src/Sema/LowerZon.zig | 52 +++++++++++++++++++++---------------------- src/print_zoir.zig | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Sema/LowerZon.zig b/src/Sema/LowerZon.zig index dd8c91c244518ac23d1d5d0be6caa30861f2c4c7..f6d39006af6a0605ad5fd77a8494504bc266b4cb 100644 --- a/src/Sema/LowerZon.zig +++ b/src/Sema/LowerZon.zig @@ -71,7 +71,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter const gpa = comp.gpa; const io = comp.io; const ip = &pt.zcu.intern_pool; - switch (node.get(self.file.zoir.?)) { + switch (node.get(&self.file.zoir.?)) { .true => return .bool_true, .false => return .bool_false, .null => return .null_value, @@ -101,7 +101,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter gpa, io, pt.tid, - val.get(self.file.zoir.?), + val.get(&self.file.zoir.?), .no_embedded_nulls, ), }), @@ -174,7 +174,7 @@ fn lowerExprAnonResTy(self: *LowerZon, node: Zoir.Node.Index) CompileError!Inter gpa, io, pt.tid, - zoir_name.get(self.file.zoir.?), + zoir_name.get(&self.file.zoir.?), .no_embedded_nulls, ); field_ty.* = ip.typeOf(field_val); @@ -312,7 +312,7 @@ fn checkTypeInner( fn nodeSrc(self: *LowerZon, node: Zoir.Node.Index) LazySrcLoc { return .{ .base_node_inst = self.base_node_inst, - .offset = .{ .node_abs = node.getAstNode(self.file.zoir.?) }, + .offset = .{ .node_abs = node.getAstNode(&self.file.zoir.?) }, }; } @@ -363,7 +363,7 @@ fn lowerExprKnownResTyInner( .optional => return pt.intern(.{ .opt = .{ .ty = res_ty.toIntern(), - .val = if (node.get(self.file.zoir.?) == .null) b: { + .val = if (node.get(&self.file.zoir.?) == .null) b: { break :b .none; } else b: { const child_type = res_ty.optionalChild(pt.zcu); @@ -418,7 +418,7 @@ fn lowerExprKnownResTyInner( } fn lowerBool(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index { - return switch (node.get(self.file.zoir.?)) { + return switch (node.get(&self.file.zoir.?)) { .true => .bool_true, .false => .bool_false, else => return error.WrongType, @@ -431,7 +431,7 @@ fn lowerInt( res_ty: Type, ) !InternPool.Index { @setFloatMode(.strict); - return switch (node.get(self.file.zoir.?)) { + return switch (node.get(&self.file.zoir.?)) { .int_literal => |int| switch (int) { .small => |val| { const rhs: i32 = val; @@ -555,7 +555,7 @@ fn lowerFloat( res_ty: Type, ) !InternPool.Index { @setFloatMode(.strict); - const value = switch (node.get(self.file.zoir.?)) { + const value = switch (node.get(&self.file.zoir.?)) { .int_literal => |int| switch (int) { .small => |val| try self.sema.pt.floatValue(res_ty, @as(f128, @floatFromInt(val))), .big => |val| try self.sema.pt.floatValue(res_ty, val.toFloat(f128, .nearest_even)[0]), @@ -592,7 +592,7 @@ fn lowerFloat( } fn lowerNull(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index { - switch (node.get(self.file.zoir.?)) { + switch (node.get(&self.file.zoir.?)) { .null => return .null_value, else => return error.WrongType, } @@ -600,7 +600,7 @@ fn lowerNull(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index { fn lowerArray(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.Index { const array_info = res_ty.arrayInfo(self.sema.pt.zcu); - const nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) { + const nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) { .array_literal => |nodes| nodes, .empty_literal => .{ .start = node, .len = 0 }, else => return error.WrongType, @@ -633,13 +633,13 @@ fn lowerEnum(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.I const io = comp.io; const ip = &pt.zcu.intern_pool; try self.sema.ensureLayoutResolved(res_ty, self.import_loc, .init); - switch (node.get(self.file.zoir.?)) { + switch (node.get(&self.file.zoir.?)) { .enum_literal => |field_name| { const field_name_interned = try ip.getOrPutString( gpa, io, self.sema.pt.tid, - field_name.get(self.file.zoir.?), + field_name.get(&self.file.zoir.?), .no_embedded_nulls, ); const field_index = res_ty.enumFieldIndex(field_name_interned, self.sema.pt.zcu) orelse { @@ -648,7 +648,7 @@ fn lowerEnum(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool.I "enum {f} has no member named '{f}'", .{ res_ty.fmt(self.sema.pt), - std.zig.fmtId(field_name.get(self.file.zoir.?)), + std.zig.fmtId(field_name.get(&self.file.zoir.?)), }, ); }; @@ -667,13 +667,13 @@ fn lowerEnumLiteral(self: *LowerZon, node: Zoir.Node.Index) !InternPool.Index { const gpa = comp.gpa; const io = comp.io; const ip = &pt.zcu.intern_pool; - switch (node.get(self.file.zoir.?)) { + switch (node.get(&self.file.zoir.?)) { .enum_literal => |field_name| { const field_name_interned = try ip.getOrPutString( gpa, io, self.sema.pt.tid, - field_name.get(self.file.zoir.?), + field_name.get(&self.file.zoir.?), .no_embedded_nulls, ); return self.sema.pt.intern(.{ .enum_literal = field_name_interned }); @@ -696,7 +696,7 @@ fn lowerTuple(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. const tuple_info = ip.indexToKey(res_ty.toIntern()).tuple_type; - const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) { + const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) { .array_literal => |nodes| nodes, .empty_literal => .{ .start = node, .len = 0 }, else => return error.WrongType, @@ -720,7 +720,7 @@ fn lowerTuple(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. "index {} outside tuple of length {}", .{ elems.len, - elem_nodes.at(@intCast(i)).getAstNode(self.file.zoir.?), + elem_nodes.at(@intCast(i)).getAstNode(&self.file.zoir.?), }, ); } @@ -760,7 +760,7 @@ fn lowerStruct(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool try self.sema.ensureStructDefaultsResolved(res_ty, self.import_loc); const struct_info = self.sema.pt.zcu.typeToStruct(res_ty).?; - const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(self.file.zoir.?)) { + const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(&self.file.zoir.?)) { .struct_literal => |fields| fields, .empty_literal => .{ .names = &.{}, .vals = .{ .start = node, .len = 0 } }, else => return error.WrongType, @@ -780,7 +780,7 @@ fn lowerStruct(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool gpa, io, self.sema.pt.tid, - fields.names[i].get(self.file.zoir.?), + fields.names[i].get(&self.file.zoir.?), .no_embedded_nulls, ); const field_node = fields.vals.at(@intCast(i)); @@ -844,7 +844,7 @@ fn lowerSlice(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. const string_alignment = ptr_info.flags.alignment == .none or ptr_info.flags.alignment == .@"1"; const string_sentinel = ptr_info.sentinel == .none or ptr_info.sentinel == .zero_u8; if (string_alignment and ptr_info.child == .u8_type and string_sentinel) { - switch (node.get(self.file.zoir.?)) { + switch (node.get(&self.file.zoir.?)) { .string_literal => |val| { const ip_str = try ip.getOrPutString(gpa, io, self.sema.pt.tid, val, .maybe_embedded_nulls); const str_ref = try self.sema.addStrLit(ip_str, val.len); @@ -860,7 +860,7 @@ fn lowerSlice(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. } // Slice literals - const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) { + const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) { .array_literal => |nodes| nodes, .empty_literal => .{ .start = node, .len = 0 }, else => return error.WrongType, @@ -927,19 +927,19 @@ fn lowerUnion(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. const union_info = pt.zcu.typeToUnion(res_ty).?; const enum_tag_info = ip.loadEnumType(union_info.enum_tag_type); - const field_name, const maybe_field_node = switch (node.get(self.file.zoir.?)) { + const field_name, const maybe_field_node = switch (node.get(&self.file.zoir.?)) { .enum_literal => |name| b: { const field_name = try ip.getOrPutString( gpa, io, self.sema.pt.tid, - name.get(self.file.zoir.?), + name.get(&self.file.zoir.?), .no_embedded_nulls, ); break :b .{ field_name, null }; }, .struct_literal => b: { - const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(self.file.zoir.?)) { + const fields: @FieldType(Zoir.Node, "struct_literal") = switch (node.get(&self.file.zoir.?)) { .struct_literal => |fields| fields, else => return self.fail(node, "expected type '{f}'", .{res_ty.fmt(self.sema.pt)}), }; @@ -950,7 +950,7 @@ fn lowerUnion(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool. gpa, io, self.sema.pt.tid, - fields.names[0].get(self.file.zoir.?), + fields.names[0].get(&self.file.zoir.?), .no_embedded_nulls, ); break :b .{ field_name, fields.vals.at(0) }; @@ -986,7 +986,7 @@ fn lowerVector(self: *LowerZon, node: Zoir.Node.Index, res_ty: Type) !InternPool const vector_info = ip.indexToKey(res_ty.toIntern()).vector_type; - const elem_nodes: Zoir.Node.Index.Range = switch (node.get(self.file.zoir.?)) { + const elem_nodes: Zoir.Node.Index.Range = switch (node.get(&self.file.zoir.?)) { .array_literal => |nodes| nodes, .empty_literal => .{ .start = node, .len = 0 }, else => return error.WrongType, diff --git a/src/print_zoir.zig b/src/print_zoir.zig index 93b4553b91ef13048989775d0c67b73574fd161c..412e7db4e085e5e7b58eed9bb819f6b2f4b615a3 100644 --- a/src/print_zoir.zig +++ b/src/print_zoir.zig @@ -54,7 +54,7 @@ const PrintZon = struct { } fn renderNode(pz: *PrintZon, node: Zoir.Node.Index) Error!void { - const zoir = pz.zoir; + const zoir = &pz.zoir; try pz.w.print("%{d} = ", .{@backingInt(node)}); switch (node.get(zoir)) { .true => try pz.w.writeAll("true"), -- 2.54.0