authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-23 20:27:09-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-23 20:27:09-04:00
logc432811d96de1e8ac019ce16457c3992f039cb8c
tree5676624ae7355fd30247a4e71aba2c629cc79fc7
parentf771545a7ecfa77ad18745b11d80d0f5238ecb65

fix regression in compile errors

2 files changed, 3 insertions(+), 3 deletions(-)

src/analyze.cpp+2-2
...@@ -3614,7 +3614,7 @@ static void add_top_level_decl(CodeGen *g, ScopeDecls *decls_scope, Tld *tld) {...@@ -3614,7 +3614,7 @@ static void add_top_level_decl(CodeGen *g, ScopeDecls *decls_scope, Tld *tld) {
3614 Tld *other_tld = entry->value;3614 Tld *other_tld = entry->value;
3615 if (other_tld->id == TldIdVar) {3615 if (other_tld->id == TldIdVar) {
3616 ZigVar *var = reinterpret_cast<TldVar *>(other_tld)->var;3616 ZigVar *var = reinterpret_cast<TldVar *>(other_tld)->var;
3617 if (var->var_type != nullptr && type_is_invalid(var->var_type)) {3617 if (var != nullptr && var->var_type != nullptr && type_is_invalid(var->var_type)) {
3618 return; // already reported compile error3618 return; // already reported compile error
3619 }3619 }
3620 }3620 }
...@@ -3896,7 +3896,7 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf...@@ -3896,7 +3896,7 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf
3896 bool want_err_msg = true;3896 bool want_err_msg = true;
3897 if (tld->id == TldIdVar) {3897 if (tld->id == TldIdVar) {
3898 ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;3898 ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;
3899 if (var->var_type != nullptr && type_is_invalid(var->var_type)) {3899 if (var != nullptr && var->var_type != nullptr && type_is_invalid(var->var_type)) {
3900 want_err_msg = false;3900 want_err_msg = false;
3901 }3901 }
3902 }3902 }
src/ir.cpp+1-1
...@@ -5303,7 +5303,7 @@ static ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_s...@@ -5303,7 +5303,7 @@ static ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_s
5303 bool want_err_msg = true;5303 bool want_err_msg = true;
5304 if (tld->id == TldIdVar) {5304 if (tld->id == TldIdVar) {
5305 ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;5305 ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;
5306 if (var->var_type != nullptr && type_is_invalid(var->var_type)) {5306 if (var != nullptr && var->var_type != nullptr && type_is_invalid(var->var_type)) {
5307 want_err_msg = false;5307 want_err_msg = false;
5308 }5308 }
5309 }5309 }