aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/gogo.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 64924aa8dab..b524ce11ba5 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-c8cb74e70fbe87b14bbd083730f52a68c79ec6bb
+83191e8e2cb9f47f7c1e6bcb9997f21163292612
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 d7a3651fa32..5906b447e15 100644
--- a/gcc/go/gofrontend/gogo.cc
+++ b/gcc/go/gofrontend/gogo.cc
@@ -1694,7 +1694,7 @@ Gogo::start_function(const std::string& name, Function_type* type,
++p)
{
Variable* param = new Variable(p->type(), NULL, false, true, false,
- location);
+ p->location());
if (is_varargs && p + 1 == parameters->end())
param->set_is_varargs_parameter();