Commit d1b5fac7f916745d90f0ec1718b347a36e45862a | zig

author	Andrew Kelley <andrew@ziglang.org> 2026-10-10 08:28:33+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-10-10 09:09:47+02:00
log	d1b5fac7f916745d90f0ec1718b347a36e45862a
tree	4d72db00793c04d91833f07ce022c7ff6eef1718
parent	29ec780712f120294477441e53251e796a63ae70
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

Merge pull request 'AstGen: increment baseline when inside backing tag' (#37074) from sinon/zig:astgen-offset-fix into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/37074
Reviewed-by: Andrew Kelley <andrew@ziglang.org>

3 files changed, 59 insertions(+), 12 deletions(-)

lib
- std
  - zig
    AstGen.zig
src
- print_zir.zig
test
- cases
  - compile_errors
    compile_error_in_backing_tag.zig

lib/std/zig/AstGen.zig+6

src/print_zir.zig+24-12

 @@ -1462,7 +1462,7 @@ const Writer = struct {
         if (struct_decl.backing_int_type_body) |backing_int_type_body| {
             assert(struct_decl.layout == .@"packed");
             try stream.writeAll("packed(");
-            try self.writeBracedDecl(stream, backing_int_type_body);
+            try self.writeBracedDeclWithBaseline(stream, backing_int_type_body, struct_decl.arg_baseline_src_node);
             try stream.writeAll("), ");
         } else {
             try stream.print("{s}, ", .{@tagName(struct_decl.layout)});
 @@ -1487,15 +1487,15 @@ const Writer = struct {
                 try stream.print("{f}: ", .{std.zig.fmtIdP(field_name)});
                 self.indent += 2;
-                try self.writeBracedDecl(stream, field.type_body);
+                try self.writeBracedDeclWithBaseline(stream, field.type_body, struct_decl.fields_baseline_src_node);
                 if (field.align_body) |body| {
                     try stream.writeAll(" align(");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, struct_decl.fields_baseline_src_node);
                     try stream.writeByte(')');
                 }
                 if (field.default_body) |body| {
                     try stream.writeAll(" = ");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, struct_decl.fields_baseline_src_node);
                 }
                 self.indent -= 2;
 @@ -1529,18 +1529,18 @@ const Writer = struct {
             .@"packed" => try stream.writeAll("packed, "),
             .packed_explicit => {
                 try stream.writeAll("packed(");
-                try self.writeBracedDecl(stream, union_decl.arg_type_body.?);
+                try self.writeBracedDeclWithBaseline(stream, union_decl.arg_type_body.?, union_decl.arg_baseline_src_node);
                 try stream.writeAll("), ");
             },
             .tagged_explicit => {
                 try stream.writeAll("tagged(");
-                try self.writeBracedDecl(stream, union_decl.arg_type_body.?);
+                try self.writeBracedDeclWithBaseline(stream, union_decl.arg_type_body.?, union_decl.arg_baseline_src_node);
                 try stream.writeAll("), ");
             },
             .tagged_enum => try stream.writeAll("tagged(enum), "),
             .tagged_enum_explicit => {
                 try stream.writeAll("tagged(enum(");
-                try self.writeBracedDecl(stream, union_decl.arg_type_body.?);
+                try self.writeBracedDeclWithBaseline(stream, union_decl.arg_type_body.?, union_decl.arg_baseline_src_node);
                 try stream.writeAll(")), ");
             },
         }
 @@ -1565,16 +1565,16 @@ const Writer = struct {
                 self.indent += 2;
                 if (field.type_body) |body| {
                     try stream.writeAll(": ");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, union_decl.fields_baseline_src_node);
                 }
                 if (field.align_body) |body| {
                     try stream.writeAll(" align(");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, union_decl.fields_baseline_src_node);
                     try stream.writeByte(')');
                 }
                 if (field.value_body) |body| {
                     try stream.writeAll(" = ");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, union_decl.fields_baseline_src_node);
                 }
                 self.indent -= 2;
 @@ -1603,7 +1603,7 @@ const Writer = struct {
         try self.writeFlag(stream, "nonexhaustive, ", enum_decl.nonexhaustive);
         if (enum_decl.tag_type_body) |tag_type_body| {
             try stream.writeAll("tag(");
-            try self.writeBracedDecl(stream, tag_type_body);
+            try self.writeBracedDeclWithBaseline(stream, tag_type_body, enum_decl.arg_baseline_src_node);
             try stream.writeAll("), ");
         }
 @@ -1625,7 +1625,7 @@ const Writer = struct {
                 try stream.print("{f}", .{std.zig.fmtIdP(field_name)});
                 if (field.value_body) |body| {
                     try stream.writeAll(" = ");
-                    try self.writeBracedDecl(stream, body);
+                    try self.writeBracedDeclWithBaseline(stream, body, enum_decl.fields_baseline_src_node);
                 }
                 try stream.writeAll(",\n");
             }
 @@ -2409,6 +2409,18 @@ const Writer = struct {
         try self.writeBracedBodyConditional(stream, body, self.recurse_decls);
     }
+    fn writeBracedDeclWithBaseline(
+        self: *Writer,
+        stream: *std.Io.Writer,
+        body: []const Zir.Inst.Index,
+        src_baseline: Ast.Node.Index,
+    ) !void {
+        const prev_parent_decl_node = self.parent_decl_node;
+        self.parent_decl_node = src_baseline;
+        defer self.parent_decl_node = prev_parent_decl_node;
+        try self.writeBracedDecl(stream, body);
+    }
     fn writeBracedBody(self: *Writer, stream: *std.Io.Writer, body: []const Zir.Inst.Index) !void {
         try self.writeBracedBodyConditional(stream, body, self.recurse_blocks);
     }

test/cases/compile_errors/compile_error_in_backing_tag.zig created+29

...	@@ -0,0 +1,29 @@
1	const E = enum(@compileError("enum")) {
2	x = 0,
3	};
4
5	const U = union(enum(@compileError("union"))) {
6	x = 0,
7	};
8
9	const S = packed struct(@compileError("struct")) {
10	x: u8 = 0,
11	};
12
13	comptime {
14	_ = &E.x;
15	}
16
17	comptime {
18	_ = &U.x;
19	}
20
21	comptime {
22	_ = &S{};
23	}
24
25	// error
26	//
27	// :1:16: error: enum
28	// :5:22: error: union
29	// :9:25: error: struct

...	@@ -4929,6 +4929,8 @@ fn structDeclInner(	...	@@ -4929,6 +4929,8 @@ fn structDeclInner(
4929		4929
4930	// Before any field bodies comes the backing int type, if specified.	4930	// Before any field bodies comes the backing int type, if specified.
4931	const backing_int_type_body_len: ?u32 = if (maybe_backing_int_node.unwrap()) \|backing_int_node\| len: {	4931	const backing_int_type_body_len: ?u32 = if (maybe_backing_int_node.unwrap()) \|backing_int_node\| len: {
		4932	block_scope.src_baseline = backing_int_node;
		4933	defer block_scope.src_baseline = node;
4932	if (layout != .@"packed") return astgen.failNode(	4934	if (layout != .@"packed") return astgen.failNode(
4933	backing_int_node,	4935	backing_int_node,
4934	"non-packed struct does not support backing integer type",	4936	"non-packed struct does not support backing integer type",
...	@@ -5224,6 +5226,8 @@ fn unionDeclInner(	...	@@ -5224,6 +5226,8 @@ fn unionDeclInner(
5224		5226
5225	// Before any field bodies comes the tag/backing type, if specified.	5227	// Before any field bodies comes the tag/backing type, if specified.
5226	const arg_type_body_len: ?u32 = if (opt_arg_node.unwrap()) \|arg_node\| len: {	5228	const arg_type_body_len: ?u32 = if (opt_arg_node.unwrap()) \|arg_node\| len: {
		5229	block_scope.src_baseline = arg_node;
		5230	defer block_scope.src_baseline = node;
5227	astgen.src_hasher.update(astgen.tree.getNodeSource(arg_node));	5231	astgen.src_hasher.update(astgen.tree.getNodeSource(arg_node));
5228	const type_ref = try typeExpr(&block_scope, &namespace.base, arg_node);	5232	const type_ref = try typeExpr(&block_scope, &namespace.base, arg_node);
5229	if (!block_scope.endsWithNoReturn()) {	5233	if (!block_scope.endsWithNoReturn()) {
...	@@ -5444,6 +5448,8 @@ fn containerDecl(	...	@@ -5444,6 +5448,8 @@ fn containerDecl(
5444		5448
5445	// Before any field bodies comes the tag type, if specified.	5449	// Before any field bodies comes the tag type, if specified.
5446	const tag_type_body_len: ?u32 = if (container_decl.ast.arg.unwrap()) \|tag_type_node\| len: {	5450	const tag_type_body_len: ?u32 = if (container_decl.ast.arg.unwrap()) \|tag_type_node\| len: {
		5451	block_scope.src_baseline = tag_type_node;
		5452	defer block_scope.src_baseline = node;
5447	astgen.src_hasher.update(astgen.tree.getNodeSource(tag_type_node));	5453	astgen.src_hasher.update(astgen.tree.getNodeSource(tag_type_node));
5448	const type_ref = try typeExpr(&block_scope, &namespace.base, tag_type_node);	5454	const type_ref = try typeExpr(&block_scope, &namespace.base, tag_type_node);
5449	if (!block_scope.endsWithNoReturn()) {	5455	if (!block_scope.endsWithNoReturn()) {