@@ -1940,12 +1940,9 @@
{
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);
@@ -594,6 +594,15 @@
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 @@
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;
}