authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-11-20 16:38:00+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-11-20 18:02:20-07:00
log72980388ca8aeeadb7dde51ed10aa978620e049c
tree033e92f56594ed41eb2b13ad6e743ac2c2175560
parentc6c25a1c09531d78957befe9d194436ec1c110ef

stage1: Resolve usingnamespace decls when calling @typeInfo

Closes #7176

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

src/stage1/analyze.cpp+5-1
......@@ -4386,7 +4386,7 @@ void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node, bool all
43864386 }
43874387}
43884388
4389Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) {
4389void resolve_container_usingnamespace_decls(CodeGen *g, ScopeDecls *decls_scope) {
43904390 // resolve all the using_namespace decls
43914391 for (size_t i = 0; i < decls_scope->use_decls.length; i += 1) {
43924392 TldUsingNamespace *tld_using_namespace = decls_scope->use_decls.at(i);
......@@ -4396,6 +4396,10 @@ Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) {
43964396 }
43974397 }
43984398
4399}
4400
4401Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) {
4402 resolve_container_usingnamespace_decls(g, decls_scope);
43994403 auto entry = decls_scope->decl_table.maybe_get(name);
44004404 return (entry == nullptr) ? nullptr : entry->value;
44014405}
src/stage1/analyze.hpp+1
......@@ -79,6 +79,7 @@ ZigVar *find_variable(CodeGen *g, Scope *orig_context, Buf *name, ScopeFnDef **c
7979Tld *find_decl(CodeGen *g, Scope *scope, Buf *name);
8080Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name);
8181void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node, bool allow_lazy);
82void resolve_container_usingnamespace_decls(CodeGen *g, ScopeDecls *decls_scope);
8283
8384ZigType *get_src_ptr_type(ZigType *type);
8485uint32_t get_ptr_align(CodeGen *g, ZigType *type);
src/stage1/ir.cpp+2
......@@ -24890,6 +24890,8 @@ static Error ir_make_type_info_decls(IrAnalyze *ira, IrInst* source_instr, ZigVa
2489024890 if ((err = type_resolve(ira->codegen, type_info_fn_decl_inline_type, ResolveStatusSizeKnown)))
2489124891 return err;
2489224892
24893 resolve_container_usingnamespace_decls(ira->codegen, decls_scope);
24894
2489324895 // The unresolved declarations are collected in a separate queue to avoid
2489424896 // modifying decl_table while iterating over it
2489524897 ZigList<Tld*> resolve_decl_queue{};
test/stage1/behavior/type_info.zig+14
......@@ -460,3 +460,17 @@ test "StructField.is_comptime" {
460460 expect(!info.fields[0].is_comptime);
461461 expect(info.fields[1].is_comptime);
462462}
463
464test "typeInfo resolves usingnamespace declarations" {
465 const A = struct {
466 pub const f1 = 42;
467 };
468
469 const B = struct {
470 const f0 = 42;
471 usingnamespace A;
472 };
473
474 expect(@typeInfo(B).Struct.decls.len == 2);
475 //a
476}