===================================================================
@@ -1,4 +1,4 @@
-2444eb1e8c697531f8beb403679e4ab00b16dbf5
+80403eb9e95c9642ebabb4d7c43deedaa763211f
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
===================================================================
@@ -7948,7 +7948,9 @@ Bound_method_expression::do_flatten(Gogo
Node* n = Node::make_node(this);
if ((n->encoding() & ESCAPE_MASK) == Node::ESCAPE_NONE)
ret->heap_expression()->set_allocate_on_stack();
- else if (gogo->compiling_runtime() && gogo->package_name() == "runtime")
+ else if (gogo->compiling_runtime()
+ && gogo->package_name() == "runtime"
+ && !saw_errors())
go_error_at(loc, "%s escapes to heap, not allowed in runtime",
n->ast_format(gogo).c_str());