OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

compiler: don't permit nil assignment to blank identifier. 

Fixes https://code.google.com/p/go/issues/detail?id=6005.

From-SVN: r202881
This commit is contained in:
Ian Lance Taylor 2013-09-25 03:28:06 +00:00
parent 6a9502fdf9
commit 28d18db363
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/go/gofrontend/parse.cc
View File

@ -1940,12 +1940,9 @@ Parse::init_var(const Typed_identifier& tid, Type* type, Expression* init,
{
if (this->gogo_->in_global_scope())
return this->create_dummy_global(type, init, location);
else if (type == NULL)
this->gogo_->add_statement(Statement::make_statement(init, true));
else
{
// With both a type and an initializer, create a dummy
// variable so that we will check whether the
// Create a dummy variable so that we will check whether the
// initializer can be assigned to the type.
Variable* var = new Variable(type, init, false, false, false,
location);

14
gcc/go/gofrontend/statements.cc
View File

@ -594,6 +594,15 @@ Assignment_statement::do_check_types(Gogo*)
Type* lhs_type = this->lhs_->type();
Type* rhs_type = this->rhs_->type();
// Invalid assignment of nil to the blank identifier.
if (lhs_type->is_sink_type()
&& rhs_type->is_nil_type())
{
this->report_error(_("use of untyped nil"));
return;
}
std::string reason;
bool ok;
if (this->are_hidden_fields_ok_)
@ -975,7 +984,10 @@ Tuple_assignment_statement::do_lower(Gogo*, Named_object*, Block* enclosing,
if ((*plhs)->is_sink_expression())
{
b->add_statement(Statement::make_statement(*prhs, true));
if ((*prhs)->type()->is_nil_type())
this->report_error(_("use of untyped nil"));
else
b->add_statement(Statement::make_statement(*prhs, true));
continue;
}