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) {
36143614 Tld *other_tld = entry->value;
36153615 if (other_tld->id == TldIdVar) {
36163616 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)) {
36183618 return; // already reported compile error
36193619 }
36203620 }
......@@ -3896,7 +3896,7 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf
38963896 bool want_err_msg = true;
38973897 if (tld->id == TldIdVar) {
38983898 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)) {
39003900 want_err_msg = false;
39013901 }
39023902 }
src/ir.cpp+1-1
......@@ -5303,7 +5303,7 @@ static ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_s
53035303 bool want_err_msg = true;
53045304 if (tld->id == TldIdVar) {
53055305 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)) {
53075307 want_err_msg = false;
53085308 }
53095309 }