aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/gogo.cc6
2 files changed, 6 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 1961c7e..10f8b04 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-fc9da313b4f5c13b4ac3bdddd98e699fd1c89613
+448d30b696461a39870d1b8beb1195e411300bfd
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 9a5dd57..134e037 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -1927,7 +1927,11 @@ Gogo::declare_function(const std::string& name, Function_type* type,
return ftype->add_method_declaration(name, NULL, type, location);
}
else
- go_unreachable();
+ {
+ error_at(type->receiver()->location(),
+ "invalid receiver type (receiver must be a named type)");
+ return Named_object::make_erroneous_name(name);
+ }
}
}