Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage1: fix false positive redeclared variable compile error

master
Andrew Kelley 2020-05-20 23:13:02 -04:00
parent 688aa114e4
commit 140dc2f43e
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/analyze.cpp
View File

@ -3612,6 +3612,12 @@ static void add_top_level_decl(CodeGen *g, ScopeDecls *decls_scope, Tld *tld) {
auto entry = decls_scope->decl_table.put_unique(tld->name, tld); auto entry = decls_scope->decl_table.put_unique(tld->name, tld);
if (entry) { if (entry) {
Tld *other_tld = entry->value; Tld *other_tld = entry->value;
if (other_tld->id == TldIdVar) {
ZigVar *var = reinterpret_cast<TldVar *>(other_tld)->var;
if (var->var_type != nullptr && type_is_invalid(var->var_type)) {
return; // already reported compile error
}
}
ErrorMsg *msg = add_node_error(g, tld->source_node, buf_sprintf("redefinition of '%s'", buf_ptr(tld->name))); ErrorMsg *msg = add_node_error(g, tld->source_node, buf_sprintf("redefinition of '%s'", buf_ptr(tld->name)));
add_error_note(g, msg, other_tld->source_node, buf_sprintf("previous definition is here")); add_error_note(g, msg, other_tld->source_node, buf_sprintf("previous definition is here"));
return; return;
@ -3887,9 +3893,18 @@ ZigVar *add_variable(CodeGen *g, AstNode *source_node, Scope *parent_scope, Buf
if (search_scope != nullptr) { if (search_scope != nullptr) {
Tld *tld = find_decl(g, search_scope, name); Tld *tld = find_decl(g, search_scope, name);
if (tld != nullptr && tld != src_tld) { if (tld != nullptr && tld != src_tld) {
ErrorMsg *msg = add_node_error(g, source_node, bool want_err_msg = true;
buf_sprintf("redefinition of '%s'", buf_ptr(name))); if (tld->id == TldIdVar) {
add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here")); ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;
if (var->var_type != nullptr && type_is_invalid(var->var_type)) {
want_err_msg = false;
}
}
if (want_err_msg) {
ErrorMsg *msg = add_node_error(g, source_node,
buf_sprintf("redefinition of '%s'", buf_ptr(name)));
add_error_note(g, msg, tld->source_node, buf_sprintf("previous definition is here"));
}
variable_entry->var_type = g->builtin_types.entry_invalid; variable_entry->var_type = g->builtin_types.entry_invalid;
} }
} }

15
src/ir.cpp
View File

@ -5300,9 +5300,18 @@ static ZigVar *create_local_var(CodeGen *codegen, AstNode *node, Scope *parent_s
} else { } else {
Tld *tld = find_decl(codegen, parent_scope, name); Tld *tld = find_decl(codegen, parent_scope, name);
if (tld != nullptr) { if (tld != nullptr) {
ErrorMsg *msg = add_node_error(codegen, node, bool want_err_msg = true;
buf_sprintf("redefinition of '%s'", buf_ptr(name))); if (tld->id == TldIdVar) {
add_error_note(codegen, msg, tld->source_node, buf_sprintf("previous definition is here")); ZigVar *var = reinterpret_cast<TldVar *>(tld)->var;
if (var->var_type != nullptr && type_is_invalid(var->var_type)) {
want_err_msg = false;
}
}
if (want_err_msg) {
ErrorMsg *msg = add_node_error(codegen, node,
buf_sprintf("redefinition of '%s'", buf_ptr(name)));
add_error_note(codegen, msg, tld->source_node, buf_sprintf("previous definition is here"));
}
variable_entry->var_type = codegen->builtin_types.entry_invalid; variable_entry->var_type = codegen->builtin_types.entry_invalid;
} }
} }