diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-07-22 14:37:08 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-07-22 14:37:08 -0400 |
| commit | 317d1ecb2cf3234b0259daf6cc0baac7d86264e2 (patch) | |
| tree | 17c8c50e096fd23e0f9b9194a8a6ac0b8a028711 /src/analyze.cpp | |
| parent | fcadeb50c04199fce2d9675ba2976680c71c67ff (diff) | |
| parent | 16be70cbbf8e6dc658b9fcacd3366df8f83fffa8 (diff) | |
| download | zig-317d1ecb2cf3234b0259daf6cc0baac7d86264e2.tar.gz zig-317d1ecb2cf3234b0259daf6cc0baac7d86264e2.zip | |
Merge remote-tracking branch 'origin/master' into rewrite-coroutines
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index 4bb3de095e..80e22c6c62 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3346,7 +3346,8 @@ static void resolve_use_decl(CodeGen *g, TldUsingNamespace *tld_using_namespace, static void preview_use_decl(CodeGen *g, TldUsingNamespace *using_namespace, ScopeDecls *dest_decls_scope) { if (using_namespace->base.resolution == TldResolutionOk || - using_namespace->base.resolution == TldResolutionInvalid) + using_namespace->base.resolution == TldResolutionInvalid || + using_namespace->using_namespace_value != nullptr) { return; } |