From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 20 Nov 2015 13:23:02 +0000 (+0000)
Subject:     compiler: Use receiver name in hash/equal for type within method.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=494c470a4ea1190b3c47fe60e215b14111bdb101;p=thirdparty%2Fgcc.git

compiler: Use receiver name in hash/equal for type within method.

    Test case sent as https://golang.org/cl/17081.

    Reviewed-on: https://go-review.googlesource.com/17082


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230657 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index d23a6cb5f58b..d43f4311ed21 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-e3aef41ce0c5be81e2589e60d9cb0db1516e9e2d
+dfa74d975884f363c74d6a66a37b1703093fdba6
 
 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/types.cc b/gcc/go/gofrontend/types.cc
index 822037d1bbf2..64b560b45d6f 100644
--- a/gcc/go/gofrontend/types.cc
+++ b/gcc/go/gofrontend/types.cc
@@ -1769,7 +1769,16 @@ Type::specific_type_functions(Gogo* gogo, Named_type* name,
       const Named_object* in_function = name->in_function(&index);
       if (in_function != NULL)
 	{
-	  base_name += '$' + Gogo::unpack_hidden_name(in_function->name());
+	  base_name.append(1, '$');
+	  const Typed_identifier* rcvr =
+	    in_function->func_value()->type()->receiver();
+	  if (rcvr != NULL)
+	    {
+	      Named_type* rcvr_type = rcvr->type()->deref()->named_type();
+	      base_name.append(Gogo::unpack_hidden_name(rcvr_type->name()));
+	      base_name.append(1, '$');
+	    }
+	  base_name.append(Gogo::unpack_hidden_name(in_function->name()));
 	  if (index > 0)
 	    {
 	      char buf[30];