From 6029114f84ea7ddbf0e40db6ee9b7c1ab4e86b95 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Fri, 20 Nov 2020 16:38:00 +0100 Subject: stage1: Resolve usingnamespace decls when calling @typeInfo Closes #7176 --- src/stage1/analyze.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/stage1/analyze.cpp') diff --git a/src/stage1/analyze.cpp b/src/stage1/analyze.cpp index 21338f5807..f9820158ed 100644 --- a/src/stage1/analyze.cpp +++ b/src/stage1/analyze.cpp @@ -4445,7 +4445,7 @@ void resolve_top_level_decl(CodeGen *g, Tld *tld, AstNode *source_node, bool all } } -Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) { +void resolve_container_usingnamespace_decls(CodeGen *g, ScopeDecls *decls_scope) { // resolve all the using_namespace decls for (size_t i = 0; i < decls_scope->use_decls.length; i += 1) { TldUsingNamespace *tld_using_namespace = decls_scope->use_decls.at(i); @@ -4455,6 +4455,10 @@ Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) { } } +} + +Tld *find_container_decl(CodeGen *g, ScopeDecls *decls_scope, Buf *name) { + resolve_container_usingnamespace_decls(g, decls_scope); auto entry = decls_scope->decl_table.maybe_get(name); return (entry == nullptr) ? nullptr : entry->value; } -- cgit v1.2.3