Commit 0fd39f9e92a25f61562b0a067a9d7b2fdbed9f8c | zig

author	Andrew Kelley <andrew@ziglang.org> 2026-10-10 08:28:33+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2026-10-10 08:28:33+02:00
log	0fd39f9e92a25f61562b0a067a9d7b2fdbed9f8c
tree	56afcd924945a774acaabf2ab91211a0113cc117
parent	6b2ac8fa5cc645b2655a4a5f99d6d808bee4da28
parent	f8420f9a1b451c0079f971c8036f0c4304826294

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

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