aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-01-26 23:58:54 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-01-26 23:58:54 +0000
commitcc24ff0dc2b163e10afaca62b25de74c5dc313fd (patch)
treedcd2ecbc5bd26426affed07bdb7e4724fb5638f4
parent6db724435ac1094b719949e69782a4ef01269513 (diff)
downloadgcc-cc24ff0dc2b163e10afaca62b25de74c5dc313fd.zip
gcc-cc24ff0dc2b163e10afaca62b25de74c5dc313fd.tar.gz
gcc-cc24ff0dc2b163e10afaca62b25de74c5dc313fd.tar.bz2
compiler: show readable names in escape analysis messages
Call message_name when printing a variable for an escape analysis message. This implies changing the AST dumps, which is fine. Reviewed-on: https://go-review.googlesource.com/90296 From-SVN: r257113
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/escape.cc2
-rw-r--r--gcc/go/gofrontend/expressions.cc4
-rw-r--r--gcc/go/gofrontend/wb.cc2
4 files changed, 5 insertions, 5 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 25801a6..2a6e183 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-897ce971b06a39c217d02dce9e1361bc7a240188
+13b25c25faa8afd625732d2630a4f9ece5cacb2e
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/escape.cc b/gcc/go/gofrontend/escape.cc
index e15e85f..873c187 100644
--- a/gcc/go/gofrontend/escape.cc
+++ b/gcc/go/gofrontend/escape.cc
@@ -131,7 +131,7 @@ Node::ast_format(Gogo* gogo) const
Named_object* no = this->object();
if (no->is_function() && no->func_value()->enclosing() != NULL)
return "func literal";
- ss << no->name();
+ ss << no->message_name();
}
else if (this->expr() != NULL)
{
diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc
index 0701cb0..534b61f 100644
--- a/gcc/go/gofrontend/expressions.cc
+++ b/gcc/go/gofrontend/expressions.cc
@@ -783,7 +783,7 @@ Var_expression::do_get_backend(Translate_context* context)
void
Var_expression::do_dump_expression(Ast_dump_context* ast_dump_context) const
{
- ast_dump_context->ostream() << this->variable_->name() ;
+ ast_dump_context->ostream() << this->variable_->message_name() ;
}
// Make a reference to a variable in an expression.
@@ -859,7 +859,7 @@ Enclosed_var_expression::do_address_taken(bool escapes)
void
Enclosed_var_expression::do_dump_expression(Ast_dump_context* adc) const
{
- adc->ostream() << this->variable_->name();
+ adc->ostream() << this->variable_->message_name();
}
// Make a reference to a variable within an enclosing function.
diff --git a/gcc/go/gofrontend/wb.cc b/gcc/go/gofrontend/wb.cc
index fb3ef4d..c550c52 100644
--- a/gcc/go/gofrontend/wb.cc
+++ b/gcc/go/gofrontend/wb.cc
@@ -151,7 +151,7 @@ Check_escape::variable(Named_object* no)
&& no->result_var_value()->is_in_heap()))
go_error_at(no->location(),
"%s escapes to heap, not allowed in runtime",
- no->name().c_str());
+ no->message_name().c_str());
return TRAVERSE_CONTINUE;
}