authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-02 15:06:32-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-05-02 15:06:32-07:00
logd5f77c0babb83e5e9d651fa96b84f374dd3f0c57
treebaf1769e190bbddd727fe21f08491630612cf961
parent0611aa39858e6d7613cda3b3da981ff6b208a5e8

stage2: fix error reporting not loading AST

In the byteOffset function, compile errors may need to compute the AST from source bytes in order to resolve source locations. Previously there were a few lines trying to access the AST before it was loaded. Trivial fix, just move load the tree at the beginning.

2 files changed, 10 insertions(+), 11 deletions(-)

BRANCH_TODO-1
......@@ -1,4 +1,3 @@
1 * running build-exe with cached ZIR crashes
21 * implement lazy struct field resolution; don't resolve struct fields until
32 they are needed.
43 * decouple AstGen from Module, Compilation
src/Module.zig+10-10
......@@ -2186,14 +2186,14 @@ pub const SrcLoc = struct {
21862186 return token_starts[src_loc.declSrcToken()] + byte_off;
21872187 },
21882188 .token_offset => |tok_off| {
2189 const tok_index = src_loc.declSrcToken() + tok_off;
21902189 const tree = try src_loc.file_scope.getTree(gpa);
2190 const tok_index = src_loc.declSrcToken() + tok_off;
21912191 const token_starts = tree.tokens.items(.start);
21922192 return token_starts[tok_index];
21932193 },
21942194 .node_offset, .node_offset_bin_op => |node_off| {
2195 const node = src_loc.declRelativeToNodeIndex(node_off);
21962195 const tree = try src_loc.file_scope.getTree(gpa);
2196 const node = src_loc.declRelativeToNodeIndex(node_off);
21972197 assert(src_loc.file_scope.tree_loaded);
21982198 const main_tokens = tree.nodes.items(.main_token);
21992199 const tok_index = main_tokens[node];
......@@ -2201,15 +2201,15 @@ pub const SrcLoc = struct {
22012201 return token_starts[tok_index];
22022202 },
22032203 .node_offset_back2tok => |node_off| {
2204 const node = src_loc.declRelativeToNodeIndex(node_off);
22052204 const tree = try src_loc.file_scope.getTree(gpa);
2205 const node = src_loc.declRelativeToNodeIndex(node_off);
22062206 const tok_index = tree.firstToken(node) - 2;
22072207 const token_starts = tree.tokens.items(.start);
22082208 return token_starts[tok_index];
22092209 },
22102210 .node_offset_var_decl_ty => |node_off| {
2211 const node = src_loc.declRelativeToNodeIndex(node_off);
22122211 const tree = try src_loc.file_scope.getTree(gpa);
2212 const node = src_loc.declRelativeToNodeIndex(node_off);
22132213 const node_tags = tree.nodes.items(.tag);
22142214 const full = switch (node_tags[node]) {
22152215 .global_var_decl => tree.globalVarDecl(node),
......@@ -2362,8 +2362,8 @@ pub const SrcLoc = struct {
23622362 },
23632363
23642364 .node_offset_for_cond, .node_offset_if_cond => |node_off| {
2365 const node = src_loc.declRelativeToNodeIndex(node_off);
23662365 const tree = try src_loc.file_scope.getTree(gpa);
2366 const node = src_loc.declRelativeToNodeIndex(node_off);
23672367 const node_tags = tree.nodes.items(.tag);
23682368 const src_node = switch (node_tags[node]) {
23692369 .if_simple => tree.ifSimple(node).ast.cond_expr,
......@@ -2381,8 +2381,8 @@ pub const SrcLoc = struct {
23812381 return token_starts[tok_index];
23822382 },
23832383 .node_offset_bin_lhs => |node_off| {
2384 const node = src_loc.declRelativeToNodeIndex(node_off);
23852384 const tree = try src_loc.file_scope.getTree(gpa);
2385 const node = src_loc.declRelativeToNodeIndex(node_off);
23862386 const node_datas = tree.nodes.items(.data);
23872387 const src_node = node_datas[node].lhs;
23882388 const main_tokens = tree.nodes.items(.main_token);
......@@ -2391,8 +2391,8 @@ pub const SrcLoc = struct {
23912391 return token_starts[tok_index];
23922392 },
23932393 .node_offset_bin_rhs => |node_off| {
2394 const node = src_loc.declRelativeToNodeIndex(node_off);
23952394 const tree = try src_loc.file_scope.getTree(gpa);
2395 const node = src_loc.declRelativeToNodeIndex(node_off);
23962396 const node_datas = tree.nodes.items(.data);
23972397 const src_node = node_datas[node].rhs;
23982398 const main_tokens = tree.nodes.items(.main_token);
......@@ -2402,8 +2402,8 @@ pub const SrcLoc = struct {
24022402 },
24032403
24042404 .node_offset_switch_operand => |node_off| {
2405 const node = src_loc.declRelativeToNodeIndex(node_off);
24062405 const tree = try src_loc.file_scope.getTree(gpa);
2406 const node = src_loc.declRelativeToNodeIndex(node_off);
24072407 const node_datas = tree.nodes.items(.data);
24082408 const src_node = node_datas[node].lhs;
24092409 const main_tokens = tree.nodes.items(.main_token);
......@@ -2413,8 +2413,8 @@ pub const SrcLoc = struct {
24132413 },
24142414
24152415 .node_offset_switch_special_prong => |node_off| {
2416 const switch_node = src_loc.declRelativeToNodeIndex(node_off);
24172416 const tree = try src_loc.file_scope.getTree(gpa);
2417 const switch_node = src_loc.declRelativeToNodeIndex(node_off);
24182418 const node_datas = tree.nodes.items(.data);
24192419 const node_tags = tree.nodes.items(.tag);
24202420 const main_tokens = tree.nodes.items(.main_token);
......@@ -2439,8 +2439,8 @@ pub const SrcLoc = struct {
24392439 },
24402440
24412441 .node_offset_switch_range => |node_off| {
2442 const switch_node = src_loc.declRelativeToNodeIndex(node_off);
24432442 const tree = try src_loc.file_scope.getTree(gpa);
2443 const switch_node = src_loc.declRelativeToNodeIndex(node_off);
24442444 const node_datas = tree.nodes.items(.data);
24452445 const node_tags = tree.nodes.items(.tag);
24462446 const main_tokens = tree.nodes.items(.main_token);