diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-02-08 20:45:26 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-02-08 20:45:26 -0500 |
| commit | f9be9703758607bf01ada328c59b5b6b4a83bb83 (patch) | |
| tree | f6774eb6e844e21629d48e21c83dcd789fe8bb08 /src/analyze.cpp | |
| parent | 57edd4dcb31eeaca69b93d2caf0e1f4eb3772e3e (diff) | |
| parent | 1c236b0766bbc68f1b04e32a95683e273b26714c (diff) | |
| download | zig-f9be9703758607bf01ada328c59b5b6b4a83bb83.tar.gz zig-f9be9703758607bf01ada328c59b5b6b4a83bb83.zip | |
Merge remote-tracking branch 'origin/master' into error-sets
Diffstat (limited to 'src/analyze.cpp')
| -rw-r--r-- | src/analyze.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/analyze.cpp b/src/analyze.cpp index a7adbf4a3a..b6f08b7aec 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -3309,6 +3309,10 @@ static void resolve_decl_var(CodeGen *g, TldVar *tld_var) { is_const, init_val, &tld_var->base); tld_var->var->linkage = linkage; + if (implicit_type != nullptr && type_is_invalid(implicit_type)) { + tld_var->var->value->type = g->builtin_types.entry_invalid; + } + if (var_decl->align_expr != nullptr) { if (!analyze_const_align(g, tld_var->base.parent_scope, var_decl->align_expr, &tld_var->var->align_bytes)) { tld_var->var->value->type = g->builtin_types.entry_invalid; |