diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/gogo.cc | 10 | ||||
| -rw-r--r-- | gcc/go/gofrontend/parse.cc | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index e3a971a..56ae88e 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2b1a79c6395991fc4e60e20312ff44065fdb816b +7a6089333f4ab10449f9140c4639cfe741abcb25 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc index 52bec3d..9a5dd57 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -7408,16 +7408,10 @@ Bindings::new_definition(Named_object* old_object, Named_object* new_object) case Named_object::NAMED_OBJECT_FUNC_DECLARATION: { - Function_type* old_type = old_object->func_declaration_value()->type(); - if (new_object->is_function_declaration()) - { - Function_type* new_type = - new_object->func_declaration_value()->type(); - if (old_type->is_valid_redeclaration(new_type, &reason)) - return old_object; - } if (new_object->is_function()) { + Function_type* old_type = + old_object->func_declaration_value()->type(); Function_type* new_type = new_object->func_value()->type(); if (old_type->is_valid_redeclaration(new_type, &reason)) { diff --git a/gcc/go/gofrontend/parse.cc b/gcc/go/gofrontend/parse.cc index b7a0c39..7f7eba4 100644 --- a/gcc/go/gofrontend/parse.cc +++ b/gcc/go/gofrontend/parse.cc @@ -2231,9 +2231,11 @@ Parse::function_decl(bool saw_nointerface) std::string extern_name = this->lex_->extern_name(); const Token* token = this->advance_token(); + bool expected_receiver = false; Typed_identifier* rec = NULL; if (token->is_op(OPERATOR_LPAREN)) { + expected_receiver = true; rec = this->receiver(); token = this->peek_token(); } @@ -2304,7 +2306,8 @@ Parse::function_decl(bool saw_nointerface) { if (named_object == NULL && !Gogo::is_sink_name(name)) { - if (fntype == NULL) + if (fntype == NULL + || (expected_receiver && rec == NULL)) this->gogo_->add_erroneous_name(name); else { |