aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/names.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 79ad326..7be0093 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-1427cedcb0faa627fd89a75e009f7898c25aa86c
+7fd845bd9414c348bfa30bd24aa0bb8e4eebf83a
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/names.cc b/gcc/go/gofrontend/names.cc
index 20f7c57..4353a00 100644
--- a/gcc/go/gofrontend/names.cc
+++ b/gcc/go/gofrontend/names.cc
@@ -238,8 +238,8 @@ int
Gogo::nested_function_num(const std::string& name)
{
std::string n(Gogo::unpack_hidden_name(name));
- go_assert(n.compare(0, 8, ".$nested") == 0);
- return strtol(n.substr(8).c_str(), NULL, 0);
+ go_assert(n.compare(0, 7, "$nested") == 0);
+ return strtol(n.substr(7).c_str(), NULL, 0);
}
// Return the name to use for a sink function, a function whose name