authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-09-29 18:51:04+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-09-30 00:09:24+03:00
log312260124279027a248d669e6096c3ab603fa188
tree6a09e77470321e38cf6687e6e6d345f8fc7c98c5
parentb3c6d774d292e6e4ddf4cd54455c4ef3c6386d66

AstGen: do not set decl_line for containers

Previously AstGen would set decl_line for containers so that declarations inside them would be relative to the start of the container but Sema was not aware of the line offset of the container and would make them relative to the containers parent decl which would then break for generic structs. In the future when working on incremental compilation it will likely be better to communicate the line delta to Sema but for now this is a simpler fix that correctly handles the non-incremental case. Closes #12725 Closes #12818

1 files changed, 4 insertions(+), 7 deletions(-)

src/AstGen.zig+4-7
......@@ -4233,13 +4233,10 @@ fn structDeclInner(
42334233 // are in scope, so that field types, alignments, and default value expressions
42344234 // can refer to decls within the struct itself.
42354235 astgen.advanceSourceCursorToNode(node);
4236 // If `node == 0` then this is the root struct and all the declarations should
4237 // be relative to the beginning of the file.
4238 const decl_line = if (node == 0) 0 else astgen.source_line;
42394236 var block_scope: GenZir = .{
42404237 .parent = &namespace.base,
42414238 .decl_node_index = node,
4242 .decl_line = decl_line,
4239 .decl_line = gz.decl_line,
42434240 .astgen = astgen,
42444241 .force_comptime = true,
42454242 .instructions = gz.instructions,
......@@ -4439,7 +4436,7 @@ fn unionDeclInner(
44394436 var block_scope: GenZir = .{
44404437 .parent = &namespace.base,
44414438 .decl_node_index = node,
4442 .decl_line = astgen.source_line,
4439 .decl_line = gz.decl_line,
44434440 .astgen = astgen,
44444441 .force_comptime = true,
44454442 .instructions = gz.instructions,
......@@ -4722,7 +4719,7 @@ fn containerDecl(
47224719 var block_scope: GenZir = .{
47234720 .parent = &namespace.base,
47244721 .decl_node_index = node,
4725 .decl_line = astgen.source_line,
4722 .decl_line = gz.decl_line,
47264723 .astgen = astgen,
47274724 .force_comptime = true,
47284725 .instructions = gz.instructions,
......@@ -4827,7 +4824,7 @@ fn containerDecl(
48274824 var block_scope: GenZir = .{
48284825 .parent = &namespace.base,
48294826 .decl_node_index = node,
4830 .decl_line = astgen.source_line,
4827 .decl_line = gz.decl_line,
48314828 .astgen = astgen,
48324829 .force_comptime = true,
48334830 .instructions = gz.instructions,