Permit _ as a result variable name.

From-SVN: r167877

diff --git a/gcc/go/gofrontend/gogo.cc b/gcc/go/gofrontend/gogo.cc
index 3a76adb77923510c10ea214655e57e8331ea18ef..39072e075b1f7a0be2e15ac7e16426a51fdbae03 100644 (file)
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -640,7 +640,7 @@ Gogo::start_function(const std::string& name, Function_type* type,
        }
     }
 
-  function->create_named_result_variables();
+  function->create_named_result_variables(this);
 
   const std::string* pname;
   std::string nested_name;
@@ -2473,7 +2473,7 @@ Function::Function(Function_type* type, Function* enclosing, Block* block,
 // Create the named result variables.
 
 void
-Function::create_named_result_variables()
+Function::create_named_result_variables(Gogo* gogo)
 {
   const Typed_identifier_list* results = this->type_->results();
   if (results == NULL
@@ -2490,10 +2490,17 @@ Function::create_named_result_variables()
        p != results->end();
        ++p, ++index)
     {
-      Result_variable* result = new Result_variable(p->type(), this,
-                                                   index);
-      Named_object* no = block->bindings()->add_result_variable(p->name(),
-                                                               result);
+      std::string name = p->name();
+      if (Gogo::is_sink_name(name))
+       {
+         static int unnamed_result_counter;
+         char buf[100];
+         snprintf(buf, sizeof buf, "_$%d", unnamed_result_counter);
+         ++unnamed_result_counter;
+         name = gogo->pack_hidden_name(buf, false);
+       }
+      Result_variable* result = new Result_variable(p->type(), this, index);
+      Named_object* no = block->bindings()->add_result_variable(name, result);
       this->named_results_->push_back(no);
     }
 }

diff --git a/gcc/go/gofrontend/gogo.h b/gcc/go/gofrontend/gogo.h
index d0cfa1e90e08f23d11452bb2c938504e8f69eaa5..49f1be51468519347bba9016940b20cb7461226e 100644 (file)
--- a/gcc/go/gofrontend/gogo.h
+++ b/gcc/go/gofrontend/gogo.h
@@ -785,7 +785,7 @@ class Function
 
   // Create the named result variables in the outer block.
   void
-  create_named_result_variables();
+  create_named_result_variables(Gogo*);
 
   // Add a new field to the closure variable.
   void